diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index c8657e5b5..a3b2b330d 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -23,29 +23,29 @@
 
 <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>
+        <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>
+        <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>
@@ -54,32 +54,31 @@
         <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='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>");
+  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>');
 }
 ?>
 
         </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>
+        <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='services/?status=0'><img src='images/16/cog_error.png' border=0 align=absmiddle /> Alerts ($service_alerts)</a></li>"); 
+echo('  <li><hr width=140 /></li>
+        <li><a href="services/?status=0"><img src="images/16/cog_error.png" border="0" align="absmiddle" /> Alerts ('.$service_alerts.')</a></li>'); 
 } ?>
 
 <?php
 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>");
+  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>');
 }
 ?>
         </ul>
@@ -88,68 +87,62 @@ 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>");
+  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') {
-  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 ($_SESSION['userlevel'] >= '5') {##FIXME html
+  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 ($ifbreak) { echo("<li><hr width=140 /></li>"); }
+if ($ifbreak) { echo('<li><hr width="140" /></li>'); }
 
 if ($interface_alerts) {
-echo("<li><a href='interfaces/?status=0'><img src='images/16/link_error.png' border=0 align=absmiddle /> Alerts ($interface_alerts)</a></li>");
+echo('<li><a href="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>
 </ul></td></tr></table>
-
 </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