diff --git a/html/includes/dev-overview-data.inc.php b/html/includes/dev-overview-data.inc.php
index b83b8c311..2a8774351 100644
--- a/html/includes/dev-overview-data.inc.php
+++ b/html/includes/dev-overview-data.inc.php
@@ -1,8 +1,12 @@
 <?php
 
+echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
+
 if ($config['overview_show_sysDescr'])
 {
-  echo('<div style="font-family: courier, serif; margin: 10px"><strong>' . $device['sysDescr'] . "</strong></div>");
+  echo("<p style='padding: 0px;' class=sectionhead>");
+  echo('<div style="font-family: courier, serif; margin: 3px"><strong>' . $device['sysDescr'] . "</strong></div>");
+  echo("</p>");
 }
 
 $uptime = $device['uptime'];
@@ -11,7 +15,8 @@ if ($device['os'] == "ios") { formatCiscoHardware($device); }
 if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
 $device['os_text'] = $config['os'][$device['os']]['text'];
 
-echo('<table width="100%">');
+echo("<table width=100% cellspacing=0 cellpadding=5>");
+echo('<tr class="device-overview"><td width="100%"><table width="100%">');
 
 if ($device['hardware'])
 {
@@ -74,7 +79,7 @@ if ($uptime)
       </tr>');
 }
 
-echo('
-    </table>');
+  echo("</table></tr></td></table>");
+  echo("</div>");
 
 ?>
diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php
index 394dce5e5..4ad42ad91 100644
--- a/html/pages/device/overview.inc.php
+++ b/html/pages/device/overview.inc.php
@@ -17,14 +17,9 @@ if ($ports['down']) { $ports_colour = $warn_colour_a; } else { $ports_colour = $
 
 echo("<table width=100% cellspacing=0 cellpadding=0><tr><td style='width: 50%; vertical-align: top;>");
 
-#if (file_exists("includes/dev-data-" . strtolower($device[os]) . ".inc.php")) {
-  echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
-#  echo("<p class=sectionhead>Device Data</p><div style='height: 5px;'></div>");
-#  include("includes/dev-data-" . strtolower($device[os]) . ".inc.php");
-  include("includes/dev-overview-data.inc.php");
-
-  echo("</div>");
-#}
+echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
+include("includes/dev-overview-data.inc.php");
+echo("</div>");
 
 include("overview/ports.inc.php");
 
@@ -52,7 +47,7 @@ if ($services['total'])
     if ($data['service_status'] == "1" && $data['service_ignore'] == "1") { $status = "green"; }
     if ($data['service_status'] == "0" && $data['service_ignore'] == "0") { $status = "red"; }
     if ($data['service_status'] == "1" && $data['service_ignore'] == "0") { $status = "blue"; }
-    echo("$break<a class=$status>" . strtolower($data[service_type]) . "</a>");
+    echo("$break<a class=$status>" . strtolower($data['service_type']) . "</a>");
     $break = ", ";
   }