diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php
index ec0bf9de8..9b42ff6a0 100644
--- a/html/pages/device/ports.inc.php
+++ b/html/pages/device/ports.inc.php
@@ -7,11 +7,26 @@ if ($_GET['opta'] == 'graphs')
 
 print_optionbar_start();
 
-echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/'>Basic</a> |
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/details/'>Details</a> |
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/arp/'>ARP Table</a> |
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/adsl/'>ADSL</a> |
-Graphs: ");
+$menu_options = array('basic' => 'Basic',
+                      'details' => 'Details',
+                      'arp' => 'ARP Table',
+                      'adsl' => 'ADSL');
+
+if (!$_GET['opta']) { $_GET['opta'] = "basic"; }
+
+$sep = "";
+foreach ($menu_options as $option => $text)
+{
+  echo($sep);
+  if ($_GET['opta'] == $option) { echo("<span class='pagemenu-selected'>"); }
+  echo('<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/ports/' . $option . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $text . '</a>');
+  if ($_GET['opta'] == $option) { echo("</span>"); }
+  $sep = " | ";
+}
+
+unset($sep);
+
+echo('Graphs: ');
 
 $graph_types = array("bits" => "Bits",
                      "upkts" => "Unicast Packets",
@@ -21,9 +36,16 @@ $graph_types = array("bits" => "Bits",
 
 foreach ($graph_types as $type => $descr)
 {
-  echo("$type_sep
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/$type/'>$descr</a>
-  (<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/$type/thumbs/'>Mini</a>) ");
+  echo("$type_sep");
+  if ($_GET['optb'] == $type && $_GET['optc'] != "thumbs") { echo("<span class='pagemenu-selected'>"); }
+  echo('<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/ports/graphs/'.$type.'/">'.$descr.'</a>');
+  if ($_GET['optb'] == $type && $_GET['optc'] != "thumbs") { echo("</span>"); }
+
+  echo('(');
+  if ($_GET['optb'] == $type && $_GET['optc'] == "thumbs") { echo("<span class='pagemenu-selected'>"); }
+  echo('<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/ports/graphs/'.$type.'/thumbs/">Mini</a>');
+  if ($_GET['optb'] == $type && $_GET['optc'] == "thumbs") { echo("</span>"); }
+  echo(')');
   $type_sep = " | ";
 }
 
@@ -84,4 +106,4 @@ if ($_GET['optc'] == thumbs)
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php
index f124a9ee9..4dd9881d6 100644
--- a/html/pages/services.inc.php
+++ b/html/pages/services.inc.php
@@ -1,9 +1,27 @@
 <?php print_optionbar_start();
 
+$menu_options = array('basic' => 'Basic',
+                      'details' => 'Details');
+
 if (!$_GET['opta']) { $_GET['opta'] = "basic"; }
 
-echo("<a href='".$config['base_url']."/services/basic/'>Basic</a> | ");
-echo("<a href='".$config['base_url']."/services/details/'>Details</a>");
+$sep = "";
+foreach ($menu_options as $option => $text)
+{
+  echo($sep);
+  if ($_GET['opta'] == $option)
+  {
+    echo("<span class='pagemenu-selected'>");
+  }
+  echo('<a href="'.$config['base_url'].'/services/' . $option . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $text . '</a>');
+  if ($_GET['opta'] == $option)
+  {
+    echo("</span>");
+  }
+  $sep = " | ";
+}
+
+unset($sep);
 
 print_optionbar_end();
 
@@ -54,4 +72,4 @@ if ($_SESSION['userlevel'] >= '5')
 
   echo("</table></div>");
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index f48f465d0..75ee951f4 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -7,9 +7,9 @@ $config['afi']['ipv4']['vpn']        = "VPNv4";
 $config['afi']['ipv6']['unicast']    = "IPv6";
 $config['afi']['ipv6']['multicast']  = "IPv6 Multicast";
 
-$config['os']['default']['over'][0]['graph']	= "device_processors";
+$config['os']['default']['over'][0]['graph']	= "device_processor";
 $config['os']['default']['over'][0]['text']	= "Processor Usage";
-$config['os']['default']['over'][1]['graph'] 	= "device_mempools";
+$config['os']['default']['over'][1]['graph'] 	= "device_mempool";
 $config['os']['default']['over'][1]['text']	= "Memory Usage";
 
 $os = "generic";
@@ -67,7 +67,7 @@ $config['os'][$os]['text']  		= "m0n0wall";
 $config['os'][$os]['type']  		= "firewall";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 
 $os = "solaris";
@@ -119,9 +119,9 @@ $config['os'][$os]['type']		= "network";
 $config['os'][$os]['ifXmcbc']		= 1;
 $config['os'][$os]['over'][0]['graph']	= "device_bits";
 $config['os'][$os]['over'][0]['text']	= "Device Traffic";
-$config['os'][$os]['over'][1]['graph']	= "device_processors";
+$config['os'][$os]['over'][1]['graph']	= "device_processor";
 $config['os'][$os]['over'][1]['text']	= "CPU Usage";
-$config['os'][$os]['over'][2]['graph']	= "device_mempools";
+$config['os'][$os]['over'][2]['graph']	= "device_mempool";
 $config['os'][$os]['over'][2]['text']	= "Memory Usage";
 $config['os'][$os]['icon']              = "cisco";
 
@@ -132,9 +132,9 @@ $config['os'][$os]['type']        	= "network";
 $config['os'][$os]['icon']        	= "cisco-old";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "iosxe";
@@ -144,9 +144,9 @@ $config['os'][$os]['type']		= "network";
 $config['os'][$os]['ifXmcbc']       	= 1;
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 $config['os'][$os]['icon']		= "cisco";
 
@@ -158,9 +158,9 @@ $config['os'][$os]['ifXmcbc']       	= 1;
 $config['os'][$os]['icon']		= "cisco";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "asa";
@@ -171,7 +171,7 @@ $config['os'][$os]['type']		= "firewall";
 $config['os'][$os]['icon']		= "cisco";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 
 $os = "pix";
@@ -182,9 +182,9 @@ $config['os'][$os]['type']		= "firewall";
 $config['os'][$os]['icon']              = "cisco";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "nxos";
@@ -194,9 +194,9 @@ $config['os'][$os]['type']  		= "network";
 $config['os'][$os]['icon']              = "cisco";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "sanos";
@@ -206,9 +206,9 @@ $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "cisco";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "catos";
@@ -219,9 +219,9 @@ $config['os'][$os]['type']		= "network";
 $config['os'][$os]['icon']              = "cisco-old";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "vrp";
@@ -235,9 +235,9 @@ $config['os'][$os]['text']		= "Juniper JunOS";
 $config['os'][$os]['type']		= "network";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "jwos";
@@ -250,9 +250,9 @@ $config['os'][$os]['text']		= "Juniper ScreenOS";
 $config['os'][$os]['type']		= "firewall";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "fortigate";
@@ -260,9 +260,9 @@ $config['os'][$os]['text']              = "Fortinet Fortigate";
 $config['os'][$os]['type']              = "firewall";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-#$config['os'][$os]['over'][1]['graph']  = "device_processors";
+#$config['os'][$os]['over'][1]['graph']  = "device_processor";
 #$config['os'][$os]['over'][1]['text']   = "CPU Usage";
-#$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+#$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 #$config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "routeros";
@@ -271,9 +271,9 @@ $config['os'][$os]['type']		= "network";
 $config['os'][$os]['nobulk']		= 1;
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "junose";
@@ -282,9 +282,9 @@ $config['os'][$os]['type']		= "network";
 $config['os'][$os]['icon']		= "junos";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "ironware";
@@ -292,9 +292,9 @@ $config['os'][$os]['text']       	= "Brocade IronWare";
 $config['os'][$os]['type']       	= "network";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "extremeware";
@@ -304,9 +304,9 @@ $config['os'][$os]['ifname']  		= 1;
 $config['os'][$os]['icon']    		= "extreme";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "packetshaper";
@@ -321,9 +321,9 @@ $config['os'][$os]['group']		= "extremeware";
 $config['os'][$os]['icon']		= "extreme";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "ftos";
@@ -332,9 +332,9 @@ $config['os'][$os]['type']		= "network";
 $config['os'][$os]['icon']		= "force10";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "arista_eos";
@@ -343,9 +343,9 @@ $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "arista";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "proxim";
@@ -367,9 +367,9 @@ $config['os'][$os]['ifname']       	= 1;
 $config['os'][$os]['type']         	= "network";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-#$config['os'][$os]['over'][2]['graph']   = "device_mempools";
+#$config['os'][$os]['over'][2]['graph']   = "device_mempool";
 #$config['os'][$os]['over'][2]['text']    = "Memory Usage";
 
 $os = "powervault";
@@ -458,9 +458,9 @@ $config['os'][$os]['type']       	= "network";
 $config['os'][$os]['icon']       	= "hp";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Traffic";
-$config['os'][$os]['over'][1]['graph']  = "device_processors";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
-$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "speedtouch";
@@ -773,12 +773,12 @@ $config['graph_types']['device']['hr_processes']['descr'] = 'Running Processes';
 $config['graph_types']['device']['hr_users']['section'] = 'system';
 $config['graph_types']['device']['hr_users']['order'] = '0';
 $config['graph_types']['device']['hr_users']['descr'] = 'Users Logged In';
-$config['graph_types']['device']['mempools']['section'] = 'system';
-$config['graph_types']['device']['mempools']['order'] = '0';
-$config['graph_types']['device']['mempools']['descr'] = 'Memory Pool Usage';
-$config['graph_types']['device']['processors']['section'] = 'system';
-$config['graph_types']['device']['processors']['order'] = '0';
-$config['graph_types']['device']['processors']['descr'] = 'Processor Usage';
+$config['graph_types']['device']['mempool']['section'] = 'system';
+$config['graph_types']['device']['mempool']['order'] = '0';
+$config['graph_types']['device']['mempool']['descr'] = 'Memory Pool Usage';
+$config['graph_types']['device']['processor']['section'] = 'system';
+$config['graph_types']['device']['processor']['order'] = '0';
+$config['graph_types']['device']['processor']['descr'] = 'Processor Usage';
 $config['graph_types']['device']['storage']['section'] = 'system';
 $config['graph_types']['device']['storage']['order'] = '0';
 $config['graph_types']['device']['storage']['descr'] = 'Filesystem Usage';