diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index 77e810311..7b4cf78da 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -22,31 +22,25 @@ echo('  <tr background="'.$bg_image.'" bgcolor="' . $bg . '" onmouseover="this.s
           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>
-          <br />' . $device['sysName'] . '</td>
-	     <td width=55>');
+          <br />' . $device['sysName'] . '</td>'
+	);
 
+echo ('<td width="55">');
 if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.$port_count); }
 echo('<br />');
 if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
+echo ('</td>');
 
-echo('   </td>
-          <td width="200">' . $device['os_text'] . '<br />
-          ' . $device['version'] . '</td>
-          <td width="200">' . $device['hardware'] . '<br />
-          ' . $device['features'] . '</td>
-          <td>' . formatUptime($device['uptime']) . '
-          <br />');
-if (get_dev_attrib($device,'override_sysLocation_bool'))
-{
-  echo(get_dev_attrib($device,'override_sysLocation_string'));
-}
-else
-{
-  echo($device['location']);
-}
-echo('</td>
-          <td width="10">
-          </td>
-        </tr>');
+echo('    <td>' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
 
-?>
\ No newline at end of file
+echo('    <td>' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
+
+echo('    <td>' . formatUptime($device['uptime']) . ' <br /></td>');
+
+$location = $device['location'];
+if (get_dev_attrib($device,'override_sysLocation_bool')) {  $location = get_dev_attrib($device,'override_sysLocation_string'); }
+echo('    <td>' . $location . '<br /></td>');
+
+echo (' </tr>');
+
+?>
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 4c1fa5997..b3008156d 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -121,7 +121,7 @@ if ($_GET['status'] == "alerted")
 }
 
 echo('<table cellpadding="7" cellspacing="0" class="devicetable sortable" width="100%">
-<tr class="tablehead"><th></th><th>Device</th><th></th><th>Operating System</th><th>Platform</th><th>Uptime</th></tr>');
+<tr class="tablehead"><th></th><th>Device</th><th></th><th>Operating System</th><th>Platform</th><th>Uptime</th><th>Location</th></tr>');
 
 $device_query = mysql_query($sql);
 while ($device = mysql_fetch_assoc($device_query))
@@ -138,4 +138,4 @@ while ($device = mysql_fetch_assoc($device_query))
 
 echo("</table>");
 
-?>
\ No newline at end of file
+?>