diff --git a/html/css/styles.css b/html/css/styles.css
index 6328168dc5..11701ae2c0 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -326,27 +326,43 @@ A.orange:visited, a.orange, .orange { color: #FF7400; }
         font-weight: bold;
 }
 
-a.list-device, a.list-device-ignored, a.list-device-down, a.list-device-ignored-up {
+a.list-device, a.list-device-ignored, a.list-device-down, a.list-device-ignored-up, a.list-device-disabled {
         font-weight: bold;
+	font-size: 15px;
+}
+
+tr.list-device, tr.list-device-ignored, tr.list-device-down, tr.list-device-ignored-up, tr.list-device-disabled {
 }
 
 tr.list-device-down {
 	border: 2px solid #cc0000;
 }
 
+tr.list-device-disabled {
+        border: 2px solid #aaaaaa;
+}
+
+tr.list-device-ignored {
+        border: 2px dashed #cc0000;
+}
+
+tr.list-device-ignored-up {
+	border: 2px dashed #aaaaaa;
+}
+
 .device-head, a.list-device {
 	color: #000ccc;
 }
 
 a.list-device-down, a.list-device-down, a.list-device-down:visited {
- color: #cc0000;
+ 	color: #cc0000;
 }
 
 a.list-device-ignored-up {
-	color: #009900;
+	color: #006600;
 }
 
-a.list-device-disabled {
+a.list-device-disabled, a.list-device-disabled:visited {
 	color: #999999;
 }
 
diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index 7f64930f86..2d90c10024 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -4,16 +4,21 @@ if ($bg == $list_colour_b) { $bg = $list_colour_a; } else { $bg = $list_colour_b
 
 if ($device['status'] == '0') 
 {
-  $tr = "row-alert";
   $class = "list-device-down"; 
 } else { 
   $class = "list-device"; unset ($tr); 
 }
 if ($device['ignore'] == '1') 
 {
-  $tr = "bordercolor=#eeeeee";
   $class = "list-device-ignored";
-  if ($device['status'] == '1') { $class = "list-device-ignored-up"; }
+  if ($device['status'] == '1') 
+  { 
+    $class = "list-device-ignored-up"; 
+  }
+}
+if ($device['disabled'] == '1')
+{
+  $class = "list-device-disabled";
 }
 
 $type = strtolower($device['os']);
@@ -29,7 +34,7 @@ $sensor_count = mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `
 echo('  <tr class="'.$class.'" bgcolor="' . $bg . '" onmouseover="this.style.backgroundColor=\'#fdd\';" onmouseout="this.style.backgroundColor=\'' . $bg . '\';"
           onclick="location.href=\'device/'.$device['device_id'].'/\'" style="cursor: pointer;">
           <td width="40" align="center" valign="middle">' . $image . '</td>
-          <td width="300"><span style="font-weight: bold; font-size: 14px;">' . generate_device_link($device) . '</span>
+          <td width="300">' . generate_device_link($device) . '
           <br />' . $device['sysName'] . '</td>'
 	);
 
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index b824ec4fb7..2c9ae7aee9 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -114,7 +114,7 @@ foreach (getlocations() as $location)
 <?php
 print_optionbar_end();
 
-$sql = "SELECT * FROM devices WHERE 1 $where ORDER BY `ignore`, `status`, `hostname`";
+$sql = "SELECT * FROM devices WHERE 1 $where ORDER BY `disabled` ASC, `ignore`, `status`, `hostname`";
 if ($_GET['status'] == "alerted")
 {
   $sql = "SELECT * FROM devices " . $device_alert_sql . " GROUP BY `device_id` ORDER BY `ignore`, `status`, `os`, `hostname`";