diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 04387e12d54d..2a5b9e5a5fb8 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -493,41 +493,29 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
             });
             $("#baseStatsTable").tablesorter({
                 headers: {
-                    1: {sorter: 'dateTime'},
-                    4: {sorter: 'separator'},
-                    5: {sorter: 'separator'}
+                    '.cls_dateTime': {sorter: 'dateTime'},
+                    '.cls_separator': {sorter: 'separator'}
                 }
             });
             $("#memoryStatsTable").tablesorter({
                 headers: {
-                    1: {sorter: 'filesize'},
-                    2: {sorter: 'filesize'},
-                    3: {sorter: 'filesize'}
+                    '.cls_filesize': {sorter: 'filesize'}
                 }
             });
             $("#requestStatsTable").tablesorter({
                 headers: {
-                    1: {sorter: 'separator'},
-                    2: {sorter: 'separator'},
-                    3: {sorter: 'separator'},
-                    4: {sorter: 'separator'}
+                    '.cls_separator': {sorter: 'separator'}
                 }
             });
             $("#storeStatsTable").tablesorter({
                 headers: {
-                    1: {sorter: 'separator'},
-                    2: {sorter: 'separator'},
-                    3: {sorter: 'filesize'},
-                    4: {sorter: 'filesize'},
-                    5: {sorter: 'filesize'},
-                    6: {sorter: 'filesize'}
+                    '.cls_separator': {sorter: 'separator'},
+                    '.cls_filesize': {sorter: 'filesize'}
                 }
             });
             $("#compactionStatsTable").tablesorter({
                 headers: {
-                    1: {sorter: 'separator'},
-                    2: {sorter: 'separator'},
-                    3: {sorter: 'separator'}
+                    '.cls_separator': {sorter: 'separator'}
                 }
             });
 
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index adf5443cf089..c748f4162179 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -101,11 +101,11 @@ Arrays.sort(serverNames);
 <tr>
     <th>ServerName</th>
     <th>State</th>
-    <th>Start time</th>
+    <th class="cls_dateTime">Start time</th>
     <th>Last contact</th>
     <th>Version</th>
-    <th>Requests Per Second</th>
-    <th>Num. Regions</th>
+    <th class="cls_separator">Requests Per Second</th>
+    <th class="cls_separator">Num. Regions</th>
     <%if !master.isInMaintenanceMode() && master.getMasterCoprocessorHost() != null %>
       <%if RSGroupUtil.isRSGroupEnabled(master.getConfiguration()) %>
         <th style="vertical-align: middle;" rowspan="2">RSGroup</th>
@@ -199,9 +199,9 @@ Arrays.sort(serverNames);
 <thead>
 <tr>
     <th>ServerName</th>
-    <th>Used Heap</th>
-    <th>Max Heap</th>
-    <th>Memstore Size</th>
+    <th class="cls_filesize">Used Heap</th>
+    <th class="cls_filesize">Max Heap</th>
+    <th class="cls_filesize">Memstore Size</th>
 
 </tr>
 </thead>
@@ -261,10 +261,10 @@ for (ServerName serverName: serverNames) {
 <thead>
 <tr>
     <th>ServerName</th>
-    <th>Request Per Second</th>
-    <th>Read Request Count</th>
-    <th>Filtered Read Request Count</th>
-    <th>Write Request Count</th>
+    <th class="cls_separator">Request Per Second</th>
+    <th class="cls_separator">Read Request Count</th>
+    <th class="cls_separator">Filtered Read Request Count</th>
+    <th class="cls_separator">Write Request Count</th>
 </tr>
 </thead>
 <tbody>
@@ -310,12 +310,12 @@ if (sl != null) {
 <thead>
 <tr>
     <th>ServerName</th>
-    <th>Num. Stores</th>
-    <th>Num. Storefiles</th>
-    <th>Storefile Size Uncompressed</th>
-    <th>Storefile Size</th>
-    <th>Index Size</th>
-    <th>Bloom Size</th>
+    <th class="cls_separator">Num. Stores</th>
+    <th class="cls_separator">Num. Storefiles</th>
+    <th class="cls_filesize">Storefile Size Uncompressed</th>
+    <th class="cls_filesize">Storefile Size</th>
+    <th class="cls_filesize">Index Size</th>
+    <th class="cls_filesize">Bloom Size</th>
 </tr>
 </thead>
 <tbody>
@@ -390,9 +390,9 @@ for (ServerName serverName: serverNames) {
 <thead>
 <tr>
     <th>ServerName</th>
-    <th>Num. Compacting Cells</th>
-    <th>Num. Compacted Cells</th>
-    <th>Remaining Cells</th>
+    <th class="cls_separator">Num. Compacting Cells</th>
+    <th class="cls_separator">Num. Compacted Cells</th>
+    <th class="cls_separator">Remaining Cells</th>
     <th>Compaction Progress</th>
 </tr>
 </thead>