diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index 962ec8d67..e85f56bb7 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -10,10 +10,8 @@ echo("<td class=list-bold>");
 
 foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan_vlan'])) as $port)
 {
-  if ($vars['view'])
+  if ($vars['view'] == "graphs")
   {
-    $graph_type = 'port_' . $vars['view'];
-
     echo("<div style='display: block; padding: 2px; margin: 2px; min-width: 139px; max-width:139px; min-height:85px; max-height:85px; text-align: center; float: left; background-color: ".$list_colour_b_b.";'>
     <div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div>
     <a href='device/device=".$device['device_id']."/tab=port/port=".$port['interface_id']."/' onmouseover=\"return overlib('\
diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php
index 9619a805d..9c21ae4b1 100644
--- a/html/pages/device/ports.inc.php
+++ b/html/pages/device/ports.inc.php
@@ -54,7 +54,7 @@ foreach ($graph_types as $type => $descr)
   echo(generate_link($descr,$link_array,array('view'=>'graphs','graph'=>$type)));
   if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("</span>"); }
 
-  echo('(');
+  echo(' (');
   if ($vars['graph'] == $type && $vars['view'] == "minigraphs") { echo("<span class='pagemenu-selected'>"); }
   echo(generate_link('Mini',$link_array,array('view'=>'minigraphs','graph'=>$type)));
   if ($vars['graph'] == $type && $vars['view'] == "minigraphs") { echo("</span>"); }
diff --git a/html/pages/device/vlans.inc.php b/html/pages/device/vlans.inc.php
index 4cb79628e..932b80a82 100644
--- a/html/pages/device/vlans.inc.php
+++ b/html/pages/device/vlans.inc.php
@@ -1,16 +1,58 @@
 <?php
 
+$link_array = array('page'    => 'device',
+                    'device'  => $device['device_id'],
+                    'tab' => 'vlans');
+
 print_optionbar_start();
 
 echo("<span style='font-weight: bold;'>VLANs</span> &#187; ");
 
-echo('
-      <a href="device/device=' . $device['device_id'] . '/tab=vlans/">Basic</a> | Graphs :
-      <a href="device/device=' . $device['device_id'] . '/tab=vlans/view=bits/">Bits</a> |
-      <a href="device/device=' . $device['device_id'] . '/tab=vlans/view=pkts/">Packets</a> |
-      <a href="device/device=' . $device['device_id'] . '/tab=vlans/view=nupkts/">NU Packets</a> |
-      <a href="device/device=' . $device['device_id'] . '/tab=vlans/view=errors/">Errors</a>
-     ');
+if ($vars['view'] == 'graphs' || $vars['view'] == 'minigraphs')
+{
+  if (isset($vars['graph'])) { $graph_type = "port_" . $vars['graph']; } else { $graph_type = "port_bits"; }
+}
+
+if (!$vars['view']) { $vars['view'] = "basic"; }
+  
+$menu_options['basic']   = 'Basic';
+#$menu_options['details'] = 'Details';
+
+$sep = "";
+foreach ($menu_options as $option => $text)
+{
+  echo($sep);
+  if ($vars['view'] == $option) { echo("<span class='pagemenu-selected'>"); }
+  echo(generate_link($text,$link_array,array('view'=>$option)));
+  if ($vars['view'] == $option) { echo("</span>"); }
+  $sep = " | ";
+}
+
+unset($sep);
+
+echo(' | Graphs: ');
+
+$graph_types = array("bits" => "Bits",
+                     "upkts" => "Unicast Packets",
+                     "nupkts" => "Non-Unicast Packets",
+                     "errors" => "Errors");
+
+foreach ($graph_types as $type => $descr)
+{
+  echo("$type_sep");
+  if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("<span class='pagemenu-selected'>"); }
+  echo(generate_link($descr,$link_array,array('view'=>'graphs','graph'=>$type)));
+  if ($vars['graph'] == $type && $vars['view'] == "graphs") { echo("</span>"); }
+
+/*
+  echo(' (');
+  if ($vars['graph'] == $type && $vars['type'] == "minigraphs") { echo("<span class='pagemenu-selected'>"); }
+  echo(generate_link('Mini',$link_array,array('type'=>'minigraphs','graph'=>$type)));
+  if ($vars['graph'] == $type && $vars['type'] == "minigraphs") { echo("</span>"); }
+  echo(')');
+*/
+  $type_sep = " | ";
+}
 
 print_optionbar_end();
 
diff --git a/html/pages/routing/bgp.inc.php b/html/pages/routing/bgp.inc.php
index 3670b5ac2..bba1a57a4 100644
--- a/html/pages/routing/bgp.inc.php
+++ b/html/pages/routing/bgp.inc.php
@@ -42,7 +42,7 @@ else
     echo(generate_link("Shutdown",$vars, array('adminstatus' => 'stop')));
   }
 
-  echo("|");
+  echo(" | ");
 
   if ($vars['adminstatus'] == "start")
   {