diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index b6d64f20f..09d98428e 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -6,13 +6,13 @@ echo("<tr bgcolor='$bg_colour'>");
 
 echo("<td width=100 class=list-large> Vlan " . $vlan['vlan_vlan'] . "</td>");
 echo("<td width=200 class=box-desc>" . $vlan['vlan_descr'] . "</td>");
-
 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 ($_GET['opta'])
+  if ($vars['view'])
   {
-    $graph_type = $_GET['opta'];
+    $graph_type = $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>
diff --git a/html/pages/device/vlans.inc.php b/html/pages/device/vlans.inc.php
index 4e89dece2..4cb79628e 100644
--- a/html/pages/device/vlans.inc.php
+++ b/html/pages/device/vlans.inc.php
@@ -4,13 +4,13 @@ print_optionbar_start();
 
 echo("<span style='font-weight: bold;'>VLANs</span> &#187; ");
 
-echo("
-      <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/'>Basic</a> | Graphs :
-      <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/bits/'>Bits</a> |
-      <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/pkts/'>Packets</a> |
-      <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/nupkts/'>NU Packets</a> |
-      <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/errors/'>Errors</a>
-     ");
+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>
+     ');
 
 print_optionbar_end();