diff --git a/html/includes/graphs/port/etherlike.inc.php b/html/includes/graphs/port/etherlike.inc.php
index 073dae197..2f0355556 100644
--- a/html/includes/graphs/port/etherlike.inc.php
+++ b/html/includes/graphs/port/etherlike.inc.php
@@ -21,7 +21,8 @@ if (is_file($rrd_filename))
     $rrd_list[$i]['rra'] = $oid_rra;
     $i++;
   }
-} else { echo("file missing: $file");  }
+}
+#} else { echo("file missing: $file");  }
 
 $colours   = "mixed";
 $nototal   = 1;
@@ -29,4 +30,4 @@ $unit_text = "Errors";
 
 include("includes/graphs/generic_multi_simplex_seperated.inc.php");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/print-vrf.inc.php b/html/includes/print-vrf.inc.php
index 0a5d2f451..a92c6ac9a 100644
--- a/html/includes/print-vrf.inc.php
+++ b/html/includes/print-vrf.inc.php
@@ -12,17 +12,17 @@ echo('<td class="list-bold">');
 $ports_query = mysql_query("SELECT * FROM ports WHERE `device_id` = '" . $device['device_id'] . "' AND `ifVrf` = '" . $vrf['vrf_id'] . "' ");
 while ($port = mysql_fetch_assoc($ports_query))
 {
-  if ($_GET['opta'])
+  if ($_GET['opta'] == "graphs")
   {
-    $graph_type = "port_" . $_GET['opta'];
+    $graph_type = "port_" . $_GET['optb'];
     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: #e9e9e9;'>
     <div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div>
     <a href='device/".$device['device_id']."/port/".$port['interface_id']."/' onmouseover=\"return overlib('\
     <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$port['ifDescr']."</div>\
     ".$port['ifAlias']." \
-    <img src=\'graph.php?type=$graph_type&amp;if=".$port['interface_id']."&amp;from=-2day&amp;to=".$now."&amp;width=450&amp;height=150\'>\
+    <img src=\'graph.php?type=$graph_type&amp;id=".$port['interface_id']."&amp;from=-2day&amp;to=".$now."&amp;width=450&amp;height=150\'>\
     ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".
-    "<img src='graph.php?type=$graph_type&amp;if=".$port['interface_id']."&amp;from=-2day&amp;to=".$now."&amp;width=132&amp;height=40&amp;legend=no'>
+    "<img src='graph.php?type=$graph_type&amp;id=".$port['interface_id']."&amp;from=-2day&amp;to=".$now."&amp;width=132&amp;height=40&amp;legend=no'>
     </a>
     <div style='font-size: 9px;'>".truncate(short_port_descr($port['ifAlias']), 22, '')."</div>
    </div>");
@@ -35,4 +35,4 @@ while ($port = mysql_fetch_assoc($ports_query))
 echo("</td>");
 echo("</tr>");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/device/vrfs.inc.php b/html/pages/device/vrfs.inc.php
index db08ebd5a..647f6b673 100644
--- a/html/pages/device/vrfs.inc.php
+++ b/html/pages/device/vrfs.inc.php
@@ -2,13 +2,47 @@
 
 print_optionbar_start();
 
-echo("
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vrfs/'>Basic</a> | Graphs :
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vrfs/bits/'>Bits</a> |
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vrfs/upkts/'>Packets</a> |
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vrfs/nupkts/'>NU Packets</a> |
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vrfs/errors/'>Errors</a>
- ");
+$menu_options = array('basic' => 'Basic',
+                      );
+
+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'] . '/vrfs/' . $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",
+                     "nupkts" => "Non-Unicast Packets",
+                     "errors" => "Errors",
+                     "etherlike" => "Etherlike");
+
+foreach ($graph_types as $type => $descr)
+{
+  echo("$type_sep");
+  if ($_GET['optb'] == $type) { echo("<span class='pagemenu-selected'>"); }
+  echo('<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/vrfs/graphs/'.$type.'/">'.$descr.'</a>');
+  if ($_GET['optb'] == $type) { echo("</span>"); }
+
+#  echo('(');
+#  if ($_GET['optb'] == $type) { echo("<span class='pagemenu-selected'>"); }
+#  echo('<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/vrfs/'.$type.'/thumbs/">Mini</a>');
+#  if ($_GET['optb'] == $type) { echo("</span>"); }
+#  echo(')');
+  $type_sep = " | ";
+}
+
 print_optionbar_end();
 
 echo("<div style='margin: 5px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
@@ -22,4 +56,4 @@ while ($vrf = mysql_fetch_assoc($vrf_query))
 
 echo("</table></div>");
 
-?>
\ No newline at end of file
+?>