diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index db7097a9f..743c465b0 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -310,7 +310,7 @@ if ($_SESSION['userlevel'] >= '5')
 
 ?>
 
-<li><a class="menu2four" href=""><img src="images/16/find.png" border="0" align="absmiddle" /> Search
+<li><a class="menu2four" href="search/"><img src="images/16/find.png" border="0" align="absmiddle" /> Search
 <!--[if IE 7]><!--></a><!--<![endif]-->
         <table><tr><td>
         <ul>
diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index cc2c010e9..6623a4ac8 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -28,6 +28,8 @@ if (!$_GET['optb']) { $_GET['optb'] = "nographs"; }
 
 print_optionbar_start('', '');
 
+echo('<span style="font-weight: bold;">Health</span> &#187; ');
+
 $sep = "";
 foreach ($datas as $texttype)
 {
diff --git a/html/pages/search.inc.php b/html/pages/search.inc.php
index 68edb50f9..8fe1cb9ff 100644
--- a/html/pages/search.inc.php
+++ b/html/pages/search.inc.php
@@ -6,6 +6,8 @@ if (!$_GET['opta']) { $_GET['opta'] = "ipv4"; }
 
 print_optionbar_start('', '');
 
+ echo('<span style="font-weight: bold;">Search</span> &#187; ');
+
 unset($sep);
 foreach ($sections as $type => $texttype)
 {
diff --git a/html/pages/search/ipv4.inc.php b/html/pages/search/ipv4.inc.php
index 7a17ba485..ee0f47ebb 100644
--- a/html/pages/search/ipv4.inc.php
+++ b/html/pages/search/ipv4.inc.php
@@ -38,7 +38,7 @@ while ($data = mysql_fetch_assoc($query))
 
 print_optionbar_end();
 
-echo('<table width="100%" cellspacing="0" cellpadding="2">');
+echo('<table width="100%" cellspacing="0" cellpadding="5">');
 
 if (is_numeric($_POST['device_id'])) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
 if ($_POST['interface']) { $where .= " AND I.ifDescr LIKE '".mres($_POST['interface'])."'"; }
@@ -76,9 +76,11 @@ while ($interface = mysql_fetch_assoc($query))
 
     if (port_permitted($interface['interface_id']))
     {
+      $interface = ifLabel ($interface, $interface);
+
       echo('<tr bgcolor="' . $row_colour . '">
           <td class="list-bold">' . generate_device_link($interface) . '</td>
-          <td class="list-bold">' . generate_port_link($interface, makeshortif(fixifname($interface['ifDescr']))) . ' ' . $error_img . '</td>
+          <td class="list-bold">' . generate_port_link($interface) . ' ' . $error_img . '</td>
           <td>' . $interface['ipv4_address'] . '/'.$length.'</td>
           <td>' . $interface['ifAlias'] . "</td>
         </tr>\n");
@@ -92,4 +94,4 @@ while ($interface = mysql_fetch_assoc($query))
 
 echo("</table>");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/search/ipv6.inc.php b/html/pages/search/ipv6.inc.php
index 3fcfe5d5a..6300ca8cc 100644
--- a/html/pages/search/ipv6.inc.php
+++ b/html/pages/search/ipv6.inc.php
@@ -38,7 +38,7 @@ while ($data = mysql_fetch_assoc($query))
 
 print_optionbar_end();
 
-echo('<table width="100%" cellspacing="0" cellpadding="2">');
+echo('<table width="100%" cellspacing="0" cellpadding="5">');
 
 if (is_numeric($_POST['device_id'])) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
 if ($_POST['interface']) { $where .= " AND I.ifDescr LIKE '".mres($_POST['interface'])."'"; }
@@ -76,6 +76,8 @@ while ($interface = mysql_fetch_assoc($query))
 
     if (port_permitted($interface['interface_id']))
     {
+      $interface = ifLabel ($interface, $interface);
+
       echo('<tr bgcolor="' . $row_colour . '">
           <td class="list-bold">' . generate_device_link($interface) . '</td>
           <td class="list-bold">' . generate_port_link($interface, makeshortif(fixifname($interface['ifDescr']))) . ' ' . $error_img . '</td>
@@ -92,4 +94,4 @@ while ($interface = mysql_fetch_assoc($query))
 
 echo("</table>");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/search/mac.inc.php b/html/pages/search/mac.inc.php
index fe6036fe8..dcff3c5c8 100644
--- a/html/pages/search/mac.inc.php
+++ b/html/pages/search/mac.inc.php
@@ -38,7 +38,7 @@ while ($data = mysql_fetch_assoc($query))
 
 print_optionbar_end();
 
-echo('<table width="100%" cellspacing="0" cellpadding="2">');
+echo('<table width="100%" cellspacing="0" cellpadding="5">');
 
 $where = "AND `ifPhysAddress` LIKE '%".$_POST['address']."%'";
 if (is_numeric($_POST['device_id'])) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
@@ -67,6 +67,8 @@ while ($entry = mysql_fetch_assoc($query))
 
     if (port_permitted($entry['interface_id']))
     {
+      $interface = ifLabel ($interface, $interface);
+
       echo('<tr bgcolor="' . $row_colour . '">
           <td class="list-bold">' . generate_device_link($entry) . '</td>
           <td class="list-bold">' . generate_port_link($entry, makeshortif(fixifname($entry['ifDescr']))) . ' ' . $error_img . '</td>
diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php
index cfe7e4cda..2449263ef 100644
--- a/html/pages/services.inc.php
+++ b/html/pages/services.inc.php
@@ -1,5 +1,7 @@
 <?php print_optionbar_start();
 
+ echo('<span style="font-weight: bold;">Services</span> &#187; ');
+
 $menu_options = array('basic' => 'Basic',
                       'details' => 'Details');