diff --git a/html/includes/hostbox.inc b/html/includes/hostbox.inc
index b53da3cb9..294468751 100644
--- a/html/includes/hostbox.inc
+++ b/html/includes/hostbox.inc
@@ -12,22 +12,22 @@
 
    $image = getImage($device['device_id']);
 
-   $device['os_text'] = $os_text[$device[os]]; 
+   $device['os_text'] = $os_text[$device['os']]; 
 
-   echo("  <tr bgcolor='$bg' onmouseover=\"this.style.backgroundColor='#fdd';\" onmouseout=\"this.style.backgroundColor='$bg';\" 
-             onclick=\"location.href='/device/".$device['device_id']."/'\" style='cursor: hand;'>
-             <td width='40' align=center valign=middle>$image</td>
-             <td width='300'><span style='font-weight: bold; font-size: 14px;'>" . generatedevicelink($device) . "</span>
-             <br />$device[sysName]</td>
-             <td width='200'>$device[os_text]<br />
-             $device[version]</td>
-             <td width='200'>$device[hardware]<br />
-             $device[features]</td>
-             <td>" . formatUptime($device[uptime]) . "
+   echo('  <tr bgcolor="' . $bg . '" onmouseover="this.style.backgroundColor=\'#fdd\';" onmouseout="this.style.backgroundColor=\'' . $bg . '\';" 
+             onclick="location.href=\'/device/'.$device['device_id'].'/\'" style="cursor: hand;">
+             <td width="40" align="center" valign="middle">' . $image . '</td>
+             <td width="300"><span style="font-weight: bold; font-size: 14px;">' . generatedevicelink($device) . '</span>
+             <br />' . $device['sysName'] . '</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 />
-             $device[location]</td>
-             <td width=10>
+             ' . $device['location'] . '</td>
+             <td width="10">
              </td>
-           </tr>");
+           </tr>');
 
 ?>
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index f4e024e80..ab48ee721 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -9,81 +9,77 @@
 
   $query_a = mysql_query("SELECT * FROM `devices`");
   while($device = mysql_fetch_array($query_a)) {
-    if($device['status'] == 0 && $device['ignore'] == '0') { $this_alert = "1"; } elseif($device['ignore'] == '0') {
-      if(mysql_result(mysql_query("SELECT count(service_id) FROM services WHERE service_status = '0' AND service_host = '".$device['device_id']."'"),0)) { $this_alert = "1"; }
-      if(mysql_result(mysql_query("SELECT count(*) FROM interfaces WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND device_id = '" . $device['device_id'] . "'"),0)) { $this_alert = "1"; }
+    $this_alert = 0;
+    if ($device['status'] == 0 && $device['ignore'] == '0') { $this_alert = "1"; } elseif ($device['ignore'] == '0') {
+      if (mysql_result(mysql_query("SELECT count(service_id) FROM services WHERE service_status = '0' AND service_host = '".$device['device_id']."'"),0)) { $this_alert = "1"; }
+      if (mysql_result(mysql_query("SELECT count(*) FROM interfaces WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND device_id = '" . $device['device_id'] . "'"),0)) { $this_alert = "1"; }
     }
-    if($this_alert) { 
+    if ($this_alert) { 
      $device_alerts++;
      $device_alert_sql .= " OR `device_id` = '" . $device['device_id'] . "'"; 
     }    
-    unset($this_alert);
   }
 ?>
 
 <div class="menu2">
 <ul>
-<li><a class='menu2four' href='overview/'><img src='images/16/lightbulb.png' border=0 align=absmiddle> Status</a>
+<li><a class="menu2four" href='overview/'><img src='images/16/lightbulb.png' border="0" align="absmiddle" /> Status</a>
         <table><tr><td>
         <ul>
-        <li><a href="overview/"><img src='images/16/zoom.png' border=0 align=absmiddle> Overview</a></li>
-        <?php if($config['enable_map']) {
-          echo("<li><a href='map/'><img src='images/16/map.png' border=0 align=absmiddle> Network Map</a></li>");
+        <li><a href="overview/"><img src='images/16/zoom.png' border="0" align="absmiddle" /> Overview</a></li>
+        <?php if ($config['enable_map']) {
+          echo('<li><a href="map/"><img src="images/16/map.png" border="0" align="absmiddle" /> Network Map</a></li>');
         } ?>
-        <li><a href="eventlog/"><img src='images/16/report.png' border=0 align=absmiddle> Eventlog</a></li>
-	<?php if($config['enable_syslog']) {
-  	  echo("<li><a href='syslog/'><img src='images/16/page.png' border=0 align=absmiddle> Syslog</a></li>");
+        <li><a href="eventlog/"><img src='images/16/report.png' border="0" align="absmiddle" /> Eventlog</a></li>
+	<?php if ($config['enable_syslog']) {
+  	  echo('<li><a href="syslog/"><img src="images/16/page.png" border="0" align="absmiddle" /> Syslog</a></li>');
 	} ?>
-<!--        <li><a href="alerts/"><img src='images/16/exclamation.png' border=0 align=absmiddle> Alerts</a></li> -->
-        <li><a href="inventory/"><img src='images/16/bricks.png' border=0 align=absmiddle> Inventory</a></li>
+<!--        <li><a href="alerts/"><img src='images/16/exclamation.png' border="0" align="absmiddle" /> Alerts</a></li> -->
+        <li><a href="inventory/"><img src='images/16/bricks.png' border="0" align="absmiddle" /> Inventory</a></li>
         </ul>
         </td></tr></table>
 
 </li>
 </ul>
 <ul>
-<li><a class='menu2four' href='devices/'><img src='images/16/server.png' border=0 align=absmiddle> Devices</a>
+<li><a class="menu2four" href='devices/'><img src='images/16/server.png' border="0" align="absmiddle" /> Devices</a>
         <table><tr><td>
         <ul>
-        <li><a href='devices/'><img src='images/16/server.png' border=0 align=absmiddle> All Devices</a></li>
+        <li><a href="devices/"><img src='images/16/server.png' border="0" align="absmiddle" /> All Devices</a></li>
+        <li><hr width="140" /></li>
+        <li><a href="devices/server/"><img src="images/16/server.png" border="0" align="absmiddle" /> Servers</a></li>
+        <li><a href="devices/network/"><img src="images/16/arrow_switch.png" border="0" align="absmiddle" /> Network</a></li>
+        <li><a href="devices/firewall/"><img src="images/16/shield.png" border="0" align="absmiddle" /> Firewalls</a></li>
+        <li><hr width="140" /></li>
+        <li><a href="devices/alerted/"><img src="images/16/server_error.png" border="0" align="absmiddle" /> Alerts (<?php echo $device_alerts ?>)</a></li>
 <?php
-
+if ($_SESSION['userlevel'] >= '10') {
   echo("
         <li><hr width=140 /></li>
-        <li><a href='devices/server/'><img src='images/16/server.png' border=0 align=absmiddle> Servers</a></li>
-        <li><a href='devices/network/'><img src='images/16/arrow_switch.png' border=0 align=absmiddle> Network</a></li>
-        <li><a href='devices/firewall/'><img src='images/16/shield.png' border=0 align=absmiddle> Firewalls</a></li>");
-
-  echo("        <li><hr width=140 /></li>
-        <li><a href='devices/alerted/'><img src='images/16/server_error.png' border=0 align=absmiddle> Alerts ($device_alerts)</a></li>");
-
-if($_SESSION['userlevel'] >= '10') {
-  echo("
-        <li><hr width=140 /></li>
-        <li><a href='addhost/'><img src='images/16/server_add.png' border=0 align=absmiddle> Add Device</a></li>
-        <li><a href='delhost/'><img src='images/16/server_delete.png' border=0 align=absmiddle> Delete Device</a></li>");
+        <li><a href='addhost/'><img src='images/16/server_add.png' border=0 align=absmiddle /> Add Device</a></li>
+        <li><a href='delhost/'><img src='images/16/server_delete.png' border=0 align=absmiddle /> Delete Device</a></li>");
 }
 ?>
 
         </ul>
         </td></tr></table>
 </li>
-<li><a class='menu2four' href='services/'><img src='images/16/cog.png' border=0 align=absmiddle> Services</a>
+<li><a class="menu2four" href='services/'><img src='images/16/cog.png' border="0" align="absmiddle" /> Services</a>
         <table><tr><td>
         <ul>
-        <li><a href="services/"><img src='images/16/cog.png' border=0 align=absmiddle> All Services </a></li>
-<?php if($service_alerts) { 
+        <li><a href="services/"><img src='images/16/cog.png' border="0" align="absmiddle" /> All Services </a></li>
+<?php if ($service_alerts) { 
 echo("  <li><hr width=140 /></li>
-        <li><a href='?page=services&status=0'><img src='images/16/cog_error.png' border=0 align=absmiddle> Alerts ($service_alerts)</a></li>"); 
+        <li><a href='?page=services&status=0'><img src='images/16/cog_error.png' border=0 align=absmiddle /> Alerts ($service_alerts)</a></li>"); 
 } ?>
 
 <?php
-if($_SESSION['userlevel'] >= '10') {
+if ($_SESSION['userlevel'] >= '10') {
   echo("
 
         <li><hr width=140 /></li>
-        <li><a href='addsrv/'><img src='images/16/cog_add.png' border=0 align=absmiddle> Add Service</a></li>
-        <li><a href='delsrv/'><img src='images/16/cog_delete.png' border=0 align=absmiddle> Delete Service</a></li>");
+        <li><a href='addsrv/'><img src='images/16/cog_add.png' border=0 align=absmiddle /> Add Service</a></li>
+        <li><a href='delsrv/'><img src='images/16/cog_delete.png' border=0 align=absmiddle /> Delete Service</a></li>");
 }
 ?>
         </ul>
@@ -92,56 +88,56 @@ if($_SESSION['userlevel'] >= '10') {
 
 <?php
 ## Display Locations entry if $config['show_locations']
-if($config['show_locations']) { echo("<li><a class='menu2four' href='locations/'><img src='images/16/building.png' border=0 align=absmiddle> Locations</a></li>"); }
+if ($config['show_locations']) { echo("<li><a class='menu2four' href='locations/'><img src='images/16/building.png' border=0 align=absmiddle /> Locations</a></li>"); }
 ?>
 
 
-<li><a class='menu2four' href='interfaces/'><img src='images/16/connect.png' border=0 align=absmiddle> Ports</a>
+<li><a class="menu2four" href='interfaces/'><img src='images/16/connect.png' border="0" align="absmiddle" /> Ports</a>
 
 <table><tr><td>
         <ul>
 
 
-<li><a href='interfaces/'><img src='images/16/connect.png' border=0 align=absmiddle> All Ports</a></li>
+<li><a href='interfaces/'><img src='images/16/connect.png' border="0" align="absmiddle" /> All Ports</a></li>
 
 <?php
 
-if($interfaces['errored']) {
-  echo("<li><a href='interfaces/errors/'><img src='images/16/chart_curve_error.png' border=0 align=absmiddle> Errored (".$interfaces['errored'].")</a></li>");
+if ($interfaces['errored']) {
+  echo("<li><a href='interfaces/errors/'><img src='images/16/chart_curve_error.png' border=0 align=absmiddle /> Errored (".$interfaces['errored'].")</a></li>");
 }
 
-if($config['enable_billing']) { echo("<li><a href='bills/'><img src='images/16/money_pound.png' border=0 align=absmiddle> Traffic Bills</a></li>"); $ifbreak = 1;}
+if ($config['enable_billing']) { echo("<li><a href='bills/'><img src='images/16/money_pound.png' border=0 align=absmiddle /> Traffic Bills</a></li>"); $ifbreak = 1;}
 
-if($config['enable_pseudowires']) { echo("<li><a href='pseudowires/'><img src='images/16/arrow_switch.png' border=0 align=absmiddle> Pseudowires</a></li>"); $ifbreak = 1;}
+if ($config['enable_pseudowires']) { echo("<li><a href='pseudowires/'><img src='images/16/arrow_switch.png' border=0 align=absmiddle /> Pseudowires</a></li>"); $ifbreak = 1;}
 
-if($config['enable_pseudowires']) { echo("<li><a href='vrfs/'><img src='images/16/layers.png' border=0 align=absmiddle> VRFs</a></li>"); $ifbreak = 1;}
+if ($config['enable_pseudowires']) { echo("<li><a href='vrfs/'><img src='images/16/layers.png' border=0 align=absmiddle /> VRFs</a></li>"); $ifbreak = 1;}
 
 ?> 
-<li><a href='ipv4/'><img src='images/16/email_link.png' border=0 align=absmiddle> IPv4 Search</a></li>
-<li><a href='ipv6/'><img src='images/16/email_link.png' border=0 align=absmiddle> IPv6 Search</a></li>
+<li><a href='ipv4/'><img src='images/16/email_link.png' border="0" align="absmiddle" /> IPv4 Search</a></li>
+<li><a href='ipv6/'><img src='images/16/email_link.png' border="0" align="absmiddle" /> IPv6 Search</a></li>
 
 <?php
 
-if($_SESSION['userlevel'] >= '5') {
+if ($_SESSION['userlevel'] >= '5') {
   echo("<li><hr width=140 /></li>");
-  if($config['int_customers']) { echo("<li><a href='customers/'><img src='images/16/group_link.png' border=0 align=absmiddle> Customers</a></li>"); $ifbreak = 1;}
-  if($config['int_l2tp']) { echo("<li><a href='iftype/l2tp/'><img src='images/16/user.png'border=0 align=absmiddle> L2TP</a></li>"); $ifbreak = 1; }
-  if($config['int_transit']) { echo("<li><a href='iftype/transit/'><img src='images/16/lorry_link.png' border=0 align=absmiddle> Transit</a></li>");  $ifbreak = 1; }
-  if($config['int_peering']) { echo("<li><a href='iftype/peering/'><img src='images/16/bug_link.png' border=0 align=absmiddle> Peering</a></li>"); $ifbreak = 1; }
-  if($config['int_peering'] && $config['int_transit']) { echo("<li><a href='iftype/peering,transit/'><img src='images/16/world_link.png' border=0 align=absmiddle> Peering + Transit</a></li>"); $ifbreak = 1; }
-  if($config['int_core']) { echo("<li><a href='iftype/core/'><img src='images/16/brick_link.png' border=0 align=absmiddle> Core</a></li>"); $ifbreak = 1;}
+  if ($config['int_customers']) { echo("<li><a href='customers/'><img src='images/16/group_link.png' border=0 align=absmiddle /> Customers</a></li>"); $ifbreak = 1;}
+  if ($config['int_l2tp']) { echo("<li><a href='iftype/l2tp/'><img src='images/16/user.png'border=0 align=absmiddle /> L2TP</a></li>"); $ifbreak = 1; }
+  if ($config['int_transit']) { echo("<li><a href='iftype/transit/'><img src='images/16/lorry_link.png' border=0 align=absmiddle /> Transit</a></li>");  $ifbreak = 1; }
+  if ($config['int_peering']) { echo("<li><a href='iftype/peering/'><img src='images/16/bug_link.png' border=0 align=absmiddle /> Peering</a></li>"); $ifbreak = 1; }
+  if ($config['int_peering'] && $config['int_transit']) { echo("<li><a href='iftype/peering,transit/'><img src='images/16/world_link.png' border=0 align=absmiddle /> Peering + Transit</a></li>"); $ifbreak = 1; }
+  if ($config['int_core']) { echo("<li><a href='iftype/core/'><img src='images/16/brick_link.png' border=0 align=absmiddle /> Core</a></li>"); $ifbreak = 1;}
 }
 
-if($ifbreak) { echo("<li><hr width=140 /></li>"); }
+if ($ifbreak) { echo("<li><hr width=140 /></li>"); }
 
-if($interface_alerts) {
-echo("<li><a href='?page=interfaces&status=0'><img src='images/16/link_error.png' border=0 align=absmiddle> Alerts ($interface_alerts)</a></li>");
+if ($interface_alerts) {
+echo("<li><a href='?page=interfaces&status=0'><img src='images/16/link_error.png' border=0 align=absmiddle /> Alerts ($interface_alerts)</a></li>");
 }
 
 ?>
 
-<li><a href='interfaces/down/'><img src='images/16/if-disconnect.png' border=0 align=absmiddle> Down</a></li>
-<li><a href='interfaces/admindown/'><img src='images/16/if-disable.png' border=0 align=absmiddle> Disabled</a></li>
+<li><a href='interfaces/down/'><img src='images/16/if-disconnect.png' border="0" align="absmiddle" /> Down</a></li>
+<li><a href='interfaces/admindown/'><img src='images/16/if-disable.png' border="0" align="absmiddle" /> Disabled</a></li>
 
 
 
@@ -149,57 +145,57 @@ echo("<li><a href='?page=interfaces&status=0'><img src='images/16/link_error.png
 
 </li>
 
-<li><a class="menu2four" href="/temperatures/"><img src='images/16/weather_sun.png' border=0 align=absmiddle> Temps</a></li>
+<li><a class="menu2four" href="/temperatures/"><img src='images/16/weather_sun.png' border="0" align="absmiddle" /> Temps</a></li>
 
-<li><a class="menu2four" href="/storage/"><img src='images/16/database.png' border=0 align=absmiddle> Storage</a></li>
+<li><a class="menu2four" href="/storage/"><img src='images/16/database.png' border="0" align="absmiddle" /> Storage</a></li>
 
-<!-- <li><a class="menu2four" href="/inventory/"><img src='images/16/bricks.png' border=0 align=absmiddle> Inventory</a></li> -->
+<!-- <li><a class="menu2four" href="/inventory/"><img src='images/16/bricks.png' border="0" align="absmiddle" /> Inventory</a></li> -->
 
 <?php
 
-if($_SESSION['userlevel'] >= '5') {
-echo("
-<li><a class='menu2four' href='bgp/'><img src='images/16/link.png' border=0 align=absmiddle> BGP Sessions</a>
+if ($_SESSION['userlevel'] >= '5') {
+echo('
+<li><a class="menu2four" href="bgp/"><img src="images/16/link.png" border="0" align="absmiddle" /> BGP Sessions</a>
         <table><tr><td>
         <ul>
-        <li><a href='bgp/'><img src='images/16/link.png' border=0 align=absmiddle> All Sessions </a></li>
+        <li><a href="bgp/"><img src="images/16/link.png" border="0" align="absmiddle" /> All Sessions </a></li>
 
-        <li><hr width=140 /></li>
-        <li><a href='bgp/external/'><img src='images/16/world_link.png' border=0 align=absmiddle> External BGP</a></li>
-        <li><a href='bgp/internal/'><img src='images/16/brick_link.png' border=0 align=absmiddle> Internal BGP</a></li>");
+        <li><hr width="140" /></li>
+        <li><a href="bgp/external/"><img src="images/16/world_link.png" border="0" align="absmiddle" /> External BGP</a></li>
+        <li><a href="bgp/internal/"><img src="images/16/brick_link.png" border="0" align="absmiddle" /> Internal BGP</a></li>');
 
-if($bgp_alerts) { echo("
-        <li><hr width=140/></li>
-        <li><a href='bgp/alerts/'><img src='images/16/link_error.png' border=0 align=absmiddle> Alerted ($bgp_alerts)</a></li>
-"); } 
+if ($bgp_alerts) { echo('
+        <li><hr width="140" /></li>
+        <li><a href="bgp/alerts/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted (' . $bgp_alerts . ')</a></li>
+'); } 
 
-echo("        <li><hr /></li>
+echo('        <li><hr /></li>
 
 
         </ul>
         </td></tr></table>
 </li>
-");
+');
 }
 
 ?>
 
 
-<li style='float: right;'><a><img src='images/16/wrench.png' border=0 align=absmiddle> System
+<li style="float: right;"><a><img src="images/16/wrench.png" border="0" align="absmiddle" /> System
 <!--[if IE 7]><!--></a><!--<![endif]-->
     <table><tr><td>
     <ul>
-    <li><a href="/preferences/"><img src='images/16/wrench_orange.png' border=0 align=absmiddle> My Settings</a></li>
-    <?php if($_SESSION['userlevel'] >= '10') {
-      echo("
-        <li><hr width=140 /></li>
-        <li><a href='?page=statistics'><img src='images/16/report.png' border=0 align=absmiddle> Statistics</a></li>
-        <li><hr width=140/></li>
-	<li><a href='?page=adduser'><img src='images/16/user_add.png' border=0 align=absmiddle> Add User</a></li>
-        <li><a href='?page=deluser'><img src='images/16/user_delete.png' border=0 align=absmiddle> Remove User</a></li>
-        <li><a href='?page=edituser'><img src='images/16/user_edit.png' border=0 align=absmiddle> Edit User</a></li>
-        <li><hr width=140 /></li>
-        <li><a href='authlog/'><img src='images/16/lock.png' border=0 align=absmiddle> Authlog</a></li>");
+    <li><a href="/preferences/"><img src="images/16/wrench_orange.png" border="0" align="absmiddle" /> My Settings</a></li>
+    <?php if ($_SESSION['userlevel'] >= '10') {
+      echo('
+        <li><hr width="140" /></li>
+        <li><a href="?page=statistics"><img src="images/16/report.png" border="0" align="absmiddle" /> Statistics</a></li>
+        <li><hr width="140" /></li>
+	<li><a href="?page=adduser"><img src="images/16/user_add.png" border="0" align="absmiddle" /> Add User</a></li>
+        <li><a href="?page=deluser"><img src="images/16/user_delete.png" border="0" align="absmiddle" /> Remove User</a></li>
+        <li><a href="?page=edituser"><img src="images/16/user_edit.png" border="0" align="absmiddle" /> Edit User</a></li>
+        <li><hr width="140" /></li>
+        <li><a href="authlog/"><img src="images/16/lock.png" border="0" align="absmiddle" /> Authlog</a></li>');
     } ?>
     </ul>
     </td></tr></table>
diff --git a/html/index.php b/html/index.php
index e1468f69d..5928a9139 100755
--- a/html/index.php
+++ b/html/index.php
@@ -1,4 +1,6 @@
 <?php
+  ob_start();
+  
   ini_set('allow_url_fopen', 0);
   ini_set('display_errors', 0);
 
@@ -22,9 +24,8 @@ if($debug) {
   $week = time() - (7 * 24 * 60 * 60);
   $month = time() - (31 * 24 * 60 * 60);
   $year = time() - (365 * 24 * 60 * 60);
-
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml2/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml2/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
   <title><?php echo($config['page_title']); ?></title>
@@ -52,11 +53,11 @@ function popUp(URL) {
 <script type="text/javascript" src="js/overlib.js"></script>
 <body topmargin=0 leftmargin=0 rightmargin=0 bottommargin=0>
 <div id="center">
-<div id="top" style='background: <?php echo($config['header_color']); ?>;'>
-<table cellpadding=0 cellspacing=0 width=100%>
+<div id="top" style="background: <?php echo($config['header_color']); ?>;">
+<table cellpadding="0" cellspacing="0" width="100%">
 <tr>
-<td align=left></td>
-<td align=right>
+<td align="left"></td>
+<td align="right">
   <?php
      if($_SESSION['authenticated']) { 
        echo("Logged in as <b>".$_SESSION['username']."</b> (<a href='?logout=yes'>Logout</a>)"); 
@@ -73,9 +74,9 @@ function popUp(URL) {
   <table width="100%" style="padding: 0px; margin:0px;">
     <tr>
       <td style="padding: 0px; margin:0px; border: none;">
-        <div id=logo style="padding: 10px"><a href="index.php"><img src="<?php echo($config['title_image']); ?>" border="0" /></a></div>
+        <div id="logo" style="padding: 10px"><a href="index.php"><img src="<?php echo($config['title_image']); ?>" border="0" /></a></div>
       </td>
-      <td align=center><?php
+      <td align="center"><?php
         
         $data = trim(shell_exec("cat " . $config['install_dir'] . "/rrd/version.txt"));
               
@@ -93,7 +94,7 @@ function popUp(URL) {
                 }
 
       ?></td>
-      <td align=right style="margin-right: 10px;">
+      <td align="right" style="margin-right: 10px;">
         <div id="topnav" style="float: right;">
  	  <?php if($_SESSION['authenticated']) {
 	    include("includes/topnav.inc");		
@@ -107,7 +108,7 @@ function popUp(URL) {
 
 <?php if($_SESSION['authenticated']) {include("includes/print-menubar.php");} else {echo("<hr colour=#444444 />");} ?>
 
-<div class=clearer></div>
+<div class="clearer"></div>
 
 <div class="content-mat" style="border: 1px none #fcc;">
 <div id="content" style="border: 1px none #ccc; min-height:650px;">
@@ -140,9 +141,9 @@ function popUp(URL) {
 <?php
     $end = utime(); $run = $end - $start;
     $gentime = substr($run, 0, 5);
-    echo("<br /> <center>Generated in $gentime seconds 
-          <br /> <a href='http://www.observernms.org'>Observer " . $config['version'] . "</a> &copy; 2006-2010 Adam Armstrong
-          <br />This work is licensed under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GPL, version 3</a>.");
+    echo('<br /> <center>Generated in ' . $gentime . ' seconds 
+          <br /> <a href="http://www.observernms.org">Observer ' . $config['version'] . '</a> &copy; 2006-2010 Adam Armstrong
+          <br />This work is licensed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GPL, version 3</a>.');
 	            
 ?>
 
diff --git a/includes/functions.php b/includes/functions.php
index 1ef53f28e..bc4f51882 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -343,7 +343,7 @@ $type = strtolower($data['os']);
   if(file_exists($config['html_dir'] . "/images/os/$type" . ".png")){ $image = "<img src='".$config['base_url']."/images/os/$type.png'>";
   } elseif(file_exists($config['html_dir'] . "/images/os/$type" . ".gif")){ $image = "<img src='".$config['base_url']."/images/os/$type.gif'>"; }
   if($type == "linux") {
-    $features = strtolower(trim($data[features]));
+    $features = strtolower(trim($data['features']));
     list($distro) = split(" ", $features);
     if(file_exists($config['html_dir'] . "/images/os/$distro" . ".png")){ $image = "<img src='".$config['base_url']."/images/os/$distro" . ".png'>";
     } elseif(file_exists($config['html_dir'] . "/images/os/$distro" . ".gif")){ $image = "<img src='".$config['base_url']."/images/os/$distro" . ".gif'>"; }
@@ -498,6 +498,9 @@ function formatUptime($diff, $format="long")
   $minsDiff = floor($diff/60);
   $diff -= $minsDiff*60;
   $secsDiff = $diff;
+  
+  $uptime = "";
+  
   if($format == "short") {
     if($yearsDiff > '0'){ $uptime .= $yearsDiff . "y "; }
     if($daysDiff > '0'){ $uptime .= $daysDiff . "d "; }