diff --git a/html/pages/ports/deleted.inc.php b/html/pages/deleted-ports.inc.php
similarity index 74%
rename from html/pages/ports/deleted.inc.php
rename to html/pages/deleted-ports.inc.php
index 8d340d46e..f0c85c298 100644
--- a/html/pages/ports/deleted.inc.php
+++ b/html/pages/deleted-ports.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($_GET['optb'] == "purge" && $_GET['optc'] == "all")
+if ($vars['purge'] == "all")
 {
   foreach (dbFetchRows("SELECT * FROM `ports` AS P, `devices` as D WHERE P.`deleted` = '1' AND D.device_id = P.device_id") as $interface)
   {
@@ -10,8 +10,8 @@ if ($_GET['optb'] == "purge" && $_GET['optc'] == "all")
       echo("<div class=infobox>Deleted ".generate_device_link($interface)." - ".generate_port_link($interface)."</div>");
     }
   }
-} elseif ($_GET['optb'] == "purge" && $_GET['optc']) {
-  $interface = dbFetchRow("SELECT * from `ports` AS P, `devices` AS D WHERE `interface_id` = ? AND D.device_id = P.device_id", array($_GET['optc']));
+} elseif ($vars['purge']) {
+  $interface = dbFetchRow("SELECT * from `ports` AS P, `devices` AS D WHERE `interface_id` = ? AND D.device_id = P.device_id", array($vars['purge']));
   if (port_permitted($interface['interface_id'], $interface['device_id']))
   delete_port($interface['interface_id']);
   echo("<div class=infobox>Deleted ".generate_device_link($interface)." - ".generate_port_link($interface)."</div>");
@@ -20,7 +20,7 @@ if ($_GET['optb'] == "purge" && $_GET['optc'] == "all")
 $i_deleted = 1;
 
 echo("<table cellpadding=5 cellspacing=0 border=0 width=100%>");
-echo("<tr><td></td><td></td><td></td><td><a href='".$config['base_url'] . "/ports/deleted/purge/all/'><img src='images/16/cross.png' align=absmiddle></img> Purge All</a></td></tr>");
+echo("<tr><td></td><td></td><td></td><td><a href='deleted-ports/purge=all/'><img src='images/16/cross.png' align=absmiddle></img> Purge All</a></td></tr>");
 
 foreach (dbFetchRows("SELECT * FROM `ports` AS P, `devices` as D WHERE P.`deleted` = '1' AND D.device_id = P.device_id") as $interface)
 {
@@ -33,7 +33,7 @@ foreach (dbFetchRows("SELECT * FROM `ports` AS P, `devices` as D WHERE P.`delete
     echo("<td width=250>".generate_device_link($interface)."</td>");
     echo("<td width=250>".generate_port_link($interface)."</td>");
     echo("<td></td>");
-    echo("<td width=100><a href='".$config['base_url'] . "/ports/deleted/purge/".$interface['interface_id']."/'><img src='images/16/cross.png' align=absmiddle></img> Purge</a></td>");
+    echo("<td width=100><a href='deleted-ports/purge=".$interface['interface_id']."/'><img src='images/16/cross.png' align=absmiddle></img> Purge</a></td>");
 
     $i_deleted++;
   }
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 32cf86d88..cee913ca1 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -249,7 +249,7 @@ if($format == "graph")
         $graph_type = "device_".$subformat;
 
         echo("<div style='display: block; padding: 1px; margin: 2px; min-width: 393px; max-width:393px; min-height:180px; max-height:180px; text-align: center; float: left; background-color: #f5f5f5;'>
-        <a href='device/".$device['device_id']."/port/".$device['device_id']."/' onmouseover=\"return overlib('\
+        <a href='device/".$device['device_id']."/' onmouseover=\"return overlib('\
         <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\
         <img src=\'graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=450&amp;height=150&amp;title=yes\'>\
         ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".
diff --git a/html/pages/ports.inc.php b/html/pages/ports.inc.php
index 5f4d12fb0..b544167f8 100644
--- a/html/pages/ports.inc.php
+++ b/html/pages/ports.inc.php
@@ -166,18 +166,18 @@ echo('<div style="float: right;">');
 
   if($vars['searchbar'] == "hide")
   {
-    echo('<a href="'. generate_url($vars, array('searchbar' => '')).'">Restore Search</a>');
+    echo('<a href="'. generate_url($vars, array('searchbar' => '')).'">Search</a>');
   } else {
-    echo('<a href="'. generate_url($vars, array('searchbar' => 'hide')).'">Remove Search</a>');
+    echo('<a href="'. generate_url($vars, array('searchbar' => 'hide')).'">Search</a>');
   }
 
   echo("  | ");
 
   if($vars['bare'] == "yes")
   {
-    echo('<a href="'. generate_url($vars, array('bare' => '')).'">Restore Header</a>');
+    echo('<a href="'. generate_url($vars, array('bare' => '')).'">Header</a>');
   } else {
-    echo('<a href="'. generate_url($vars, array('bare' => 'yes')).'">Remove Header</a>');
+    echo('<a href="'. generate_url($vars, array('bare' => 'yes')).'">Header</a>');
   }