diff --git a/html/includes/table/sensors.inc.php b/html/includes/table/sensors.inc.php
new file mode 100644
index 0000000000..ec4a640e5e
--- /dev/null
+++ b/html/includes/table/sensors.inc.php
@@ -0,0 +1,144 @@
+<?php
+
+$graph_type = mres($_POST['graph_type']);
+$unit       = mres($_POST['unit']);
+$class      = mres($_POST['class']);
+
+$sql = ' FROM `sensors` AS S, `devices` AS D';
+
+if (is_admin() === false && is_read() === false) {
+    $sql .= ', devices_perms as P';
+}
+
+$sql .= " WHERE S.sensor_class=? AND S.device_id = D.device_id ";
+$param[] = mres($_POST['class']);
+
+if (is_admin() === false && is_read() === false) {
+    $sql .= " AND D.device_id = P.device_id AND P.user_id = ?";
+    $param[] = $_SESSION['user_id'];
+}
+
+if (isset($searchPhrase) && !empty($searchPhrase)) {
+    $sql .= " AND (`D`.`hostname` LIKE '%$searchPhrase%' OR `sensor_descr` LIKE '%$searchPhrase%' OR `sensor_current` LIKE '%searchPhrase')";
+}
+
+$count_sql = "SELECT COUNT(`sensor_id`) $sql";
+
+$count = dbFetchCell($count_sql, $param);
+if (empty($count)) {
+    $count = 0;
+}
+
+if (!isset($sort) || empty($sort)) {
+    $sort = '`D`.`hostname`, `S`.`sensor_descr`';
+}
+
+$sql .= " ORDER BY $sort";
+
+if (isset($current)) {
+    $limit_low  = (($current * $rowCount) - ($rowCount));
+    $limit_high = $rowCount;
+}
+
+if ($rowCount != -1) {
+    $sql .= " LIMIT $limit_low,$limit_high";
+}
+
+$sql = "SELECT * $sql";
+
+foreach (dbFetchRows($sql, $param) as $sensor) {
+    if (empty($sensor['sensor_current'])) {
+        $sensor['sensor_current'] = 'NaN';
+    }
+    else {
+        if ($sensor['sensor_current'] >= $sensor['sensor_limit']) {
+            $alert = '<img src="images/16/flag_red.png" alt="alert" />';
+        }
+        else {
+            $alert = '';
+        }
+    }
+
+    // FIXME - make this "four graphs in popup" a function/include and "small graph" a function.
+    // FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"?
+    // FIXME - DUPLICATED IN device/overview/sensors
+    $graph_colour = str_replace('#', '', $row_colour);
+
+    $graph_array           = array();
+    $graph_array['height'] = '100';
+    $graph_array['width']  = '210';
+    $graph_array['to']     = $config['time']['now'];
+    $graph_array['id']     = $sensor['sensor_id'];
+    $graph_array['type']   = $graph_type;
+    $graph_array['from']   = $config['time']['day'];
+    $graph_array['legend'] = 'no';
+
+    $link_array         = $graph_array;
+    $link_array['page'] = 'graphs';
+    unset($link_array['height'], $link_array['width'], $link_array['legend']);
+    $link_graph = generate_url($link_array);
+
+    $link = generate_url(array('page' => 'device', 'device' => $sensor['device_id'], 'tab' => 'health', 'metric' => $sensor['sensor_class']));
+
+    $overlib_content = '<div style="width: 580px;"><h2>'.$device['hostname'].' - '.$sensor['sensor_descr'].'</h1>';
+    foreach (array('day', 'week', 'month', 'year') as $period) {
+        $graph_array['from'] = $config['time'][$period];
+        $overlib_content    .= str_replace('"', "\'", generate_graph_tag($graph_array));
+    }
+
+    $overlib_content .= '</div>';
+
+    $graph_array['width']  = 80;
+    $graph_array['height'] = 20;
+    $graph_array['bg']     = 'ffffff00';
+    // the 00 at the end makes the area transparent.
+    $graph_array['from'] = $config['time']['day'];
+    $sensor_minigraph =  generate_lazy_graph_tag($graph_array);
+
+    $sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 48, '');
+
+    $response[] = array(
+        'hostname'       => generate_device_link($sensor),
+        'sensor_descr'   => overlib_link($link, $sensor['sensor_descr'], $overlib_content),
+        'graph'          => overlib_link($link_graph, $sensor_minigraph, $overlib_content),
+        'alert'          => $alert,
+        'sensor_current' => $sensor['sensor_current'].$unit,
+        'sensor_range'   => round($sensor['sensor_limit_low'], 2).$unit.' - '.round($sensor['sensor_limit'], 2).$unit,
+    );
+
+    if ($_POST['view'] == 'graphs') {
+
+        $daily_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['day'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
+        $daily_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['day'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
+
+        $weekly_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['week'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
+        $weekly_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['week'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
+
+        $monthly_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['month'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
+        $monthly_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['month'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
+
+        $yearly_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['year'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
+        $yearly_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['year'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
+
+        $response[] = array(
+            'hostname'       => "<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
+            <img src='$daily_graph' border=0></a> ",
+            'sensor_descr'   => "<a onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT);\" onmouseout=\"return nd();\">
+            <img src='$weekly_graph' border=0></a> ",
+            'graph'          => "<a onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT);\" onmouseout=\"return nd();\">
+            <img src='$monthly_graph' border=0></a>",
+            'alert'          => '',
+            'sensor_current' => "<a onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT);\" onmouseout=\"return nd();\">
+            <img src='$yearly_graph' border=0></a>",
+            'sensor_range'   => '',
+        );
+    } //end if
+}//end foreach
+
+$output = array(
+    'current'  => $current,
+    'rowCount' => $rowCount,
+    'rows'     => $response,
+    'total'    => $count,
+);
+echo _json_encode($output);
diff --git a/html/pages/health/sensors.inc.php b/html/pages/health/sensors.inc.php
index b882ab4d96..b38b2da054 100644
--- a/html/pages/health/sensors.inc.php
+++ b/html/pages/health/sensors.inc.php
@@ -1,114 +1,32 @@
-<?php
+<div class="table-responsive">
+    <table id="sensors" class="table table-hover table-condensed storage">
+        <thead>
+            <tr>
+                <th data-column-id="hostname">Device</th>
+                <th data-column-id="sensor_descr">Sensor</th>
+                <th data-column-id="graph" data-sortable="false" data-searchable="false"></th>
+                <th data-column-id="alert" data-sortable="false" data-searchable="false"></th>
+                <th data-column-id="sensor_current">Current</th>
+                <th data-column-id="sensor_range" data-sortable="false" data-searchable="false">Range limit</th>
+            </tr>
+        </thead>
+    </table>
+</div>
 
-// FIXME - a little ugly...
-if ($_SESSION['userlevel'] >= '5') {
-    $sql   = "SELECT * FROM `sensors` AS S, `devices` AS D WHERE S.sensor_class='".$class."' AND S.device_id = D.device_id ORDER BY D.hostname, S.sensor_descr";
-    $param = array();
-}
-else {
-    $sql   = "SELECT * FROM `sensors` AS S, `devices` AS D, devices_perms as P WHERE S.sensor_class='".$class."' AND S.device_id = D.device_id AND D.device_id = P.device_id AND P.user_id = ? ORDER BY D.hostname, S.sensor_descr";
-    $param = array($_SESSION['user_id']);
-}
-echo '<div class="table-responsive">';
-echo '<table class="table table-condensed">';
-echo '<tr class="tablehead">
-        <th >Device</th>
-        <th>Sensor</th>
-        <th></th>
-        <th></th>
-        <th class="text-center">Current</th>
-        <th class="text-center">Range limit</th>
-        <th>Notes</th>
-      </tr>';
-
-foreach (dbFetchRows($sql, $param) as $sensor) {
-    if (empty($sensor['sensor_current'])) {
-        $sensor['sensor_current'] = 'NaN';
-    }
-    else {
-        if ($sensor['sensor_current'] >= $sensor['sensor_limit']) {
-            $alert = '<img src="images/16/flag_red.png" alt="alert" />';
-        }
-        else {
-            $alert = '';
-        }
-    }
-
-    // FIXME - make this "four graphs in popup" a function/include and "small graph" a function.
-    // FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"?
-    // FIXME - DUPLICATED IN device/overview/sensors
-    $graph_colour = str_replace('#', '', $row_colour);
-
-    $graph_array           = array();
-    $graph_array['height'] = '100';
-    $graph_array['width']  = '210';
-    $graph_array['to']     = $config['time']['now'];
-    $graph_array['id']     = $sensor['sensor_id'];
-    $graph_array['type']   = $graph_type;
-    $graph_array['from']   = $config['time']['day'];
-    $graph_array['legend'] = 'no';
-
-    $link_array         = $graph_array;
-    $link_array['page'] = 'graphs';
-    unset($link_array['height'], $link_array['width'], $link_array['legend']);
-    $link_graph = generate_url($link_array);
-
-    $link = generate_url(array('page' => 'device', 'device' => $sensor['device_id'], 'tab' => 'health', 'metric' => $sensor['sensor_class']));
-
-    $overlib_content = '<div style="width: 580px;"><h2>'.$device['hostname'].' - '.$sensor['sensor_descr'].'</h1>';
-    foreach (array('day', 'week', 'month', 'year') as $period) {
-        $graph_array['from'] = $config['time'][$period];
-        $overlib_content    .= str_replace('"', "\'", generate_graph_tag($graph_array));
-    }
-
-    $overlib_content .= '</div>';
-
-    $graph_array['width']  = 80;
-    $graph_array['height'] = 20;
-    $graph_array['bg']     = 'ffffff00';
-    // the 00 at the end makes the area transparent.
-    $graph_array['from'] = $config['time']['day'];
-    $sensor_minigraph =  generate_lazy_graph_tag($graph_array);
-
-    $sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 48, '');
-
-    echo '<tr class="health">
-          <td class=list-bold>'.generate_device_link($sensor).'</td>
-          <td>'.overlib_link($link, $sensor['sensor_descr'], $overlib_content).'</td>
-          <td >'.overlib_link($link_graph, $sensor_minigraph, $overlib_content).'</td>
-          <td >'.$alert.'</td>
-          <td class="text-center"><strong>'.$sensor['sensor_current'].$unit.'</strong></td>
-          <td class="text-center">'.round($sensor['sensor_limit_low'], 2).$unit.' - '.round($sensor['sensor_limit'], 2).$unit.'</td>
-          <td>'.(isset($sensor['sensor_notes']) ? $sensor['sensor_notes'] : '').'</td>
-        </tr>
-     ';
-
-    if ($vars['view'] == 'graphs') {
-        echo "<tr></tr><tr class='health'><td colspan=7>";
-
-        $daily_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['day'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
-        $daily_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['day'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
-
-        $weekly_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['week'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
-        $weekly_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['week'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
-
-        $monthly_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['month'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
-        $monthly_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['month'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
-
-        $yearly_graph = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['year'].'&amp;to='.$config['time']['now'].'&amp;width=211&amp;height=100';
-        $yearly_url   = 'graph.php?id='.$sensor['sensor_id'].'&amp;type='.$graph_type.'&amp;from='.$config['time']['year'].'&amp;to='.$config['time']['now'].'&amp;width=400&amp;height=150';
-
-        echo "<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$daily_graph' border=0></a> ";
-        echo "<a onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$weekly_graph' border=0></a> ";
-        echo "<a onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$monthly_graph' border=0></a> ";
-        echo "<a onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$yearly_graph' border=0></a>";
-        echo '</td></tr>';
-    } //end if
-}//end foreach
-
-echo '</table>';
-echo '</div>';
+<script>
+    var grid = $("#sensors").bootgrid({
+        ajax: true,
+        rowCount: [25,50,100,250,-1],
+        post: function ()
+        {
+            return {
+                id:         'sensors',
+                view:       '<?php echo $vars['view']; ?>',
+                graph_type: '<?php echo $graph_type; ?>',
+                unit:       '<?php echo $unit; ?>',
+                class:      '<?php echo $class; ?>',
+            };
+        },
+        url: "ajax_table.php"
+    });
+</script>