diff --git a/html/includes/graphs/location/auth.inc.php b/html/includes/graphs/location/auth.inc.php
new file mode 100644
index 000000000..b266d7e5e
--- /dev/null
+++ b/html/includes/graphs/location/auth.inc.php
@@ -0,0 +1,13 @@
+<?php
+
+foreach (dbFetchRows("SELECT * FROM `devices` WHERE `location` = ?", array($id)) as $device)
+{
+  if ($config['allow_unauth_graphs'] || device_permitted($device_id)) 
+  {
+    $devices[] = $device;
+    $title = $id;
+    $auth = TRUE;
+  }
+}
+
+?>
diff --git a/html/includes/graphs/location/bits.inc.php b/html/includes/graphs/location/bits.inc.php
new file mode 100644
index 000000000..c8296d4b9
--- /dev/null
+++ b/html/includes/graphs/location/bits.inc.php
@@ -0,0 +1,50 @@
+<?php
+
+## Generate a list of ports and then call the multi_bits grapher to generate from the list
+
+foreach($devices as $device)
+{
+ foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($device['device_id'])) as $int)
+ {
+  $ignore = 0;
+  if (is_array($config['device_traffic_iftype']))
+  {
+    foreach ($config['device_traffic_iftype'] as $iftype)
+    {
+      if (preg_match($iftype ."i", $int['ifType']))
+      {
+        $ignore = 1;
+      }
+    }
+  }
+  if (is_array($config['device_traffic_descr']))
+  {
+    foreach ($config['device_traffic_descr'] as $ifdescr)
+    {
+      if (preg_match($ifdescr."i", $int['ifDescr']) || preg_match($ifdescr."i", $int['ifName']) || preg_match($ifdescr."i", $int['portName']))
+      {
+        $ignore = 1;
+      }
+    }
+  }
+
+  if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")) && $ignore != 1)
+  {
+    $rrd_filenames[] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
+  }
+  unset($ignore);
+ }
+}
+
+$rra_in  = "INOCTETS";
+$rra_out = "OUTOCTETS";
+
+$colour_line_in = "006600";
+$colour_line_out = "000099";
+$colour_area_in = "CDEB8B";
+$colour_area_out = "C3D9FF";
+
+include("includes/graphs/generic_multi_bits.inc.php");
+
+
+?>
diff --git a/html/pages/device/routing/cef.inc.php b/html/pages/device/routing/cef.inc.php
index 1649976a1..4cc5e6888 100644
--- a/html/pages/device/routing/cef.inc.php
+++ b/html/pages/device/routing/cef.inc.php
@@ -2,26 +2,24 @@
 
 print_optionbar_start();
 
-$menu_options = array('basic' => 'Basic',
-                      'graphs' => 'Graphs',
-                      );
+$link_array = array('page'    => 'device',
+                    'device'  => $device['device_id'],
+                    'tab'     => 'routing',
+                    'proto'   => 'cef');
 
-if (!$_GET['optb']) { $_GET['optb'] = "basic"; }
+if(!isset($vars['view'])) { $vars['view'] = "basic"; }
 
 echo('<span style="font-weight: bold;">CEF</span> &#187; ');
 
-$sep = "";
-foreach ($menu_options as $option => $text)
-{
-  echo($sep);
-  if ($_GET['optb'] == $option) { echo("<span class='pagemenu-selected'>"); }
-  echo('<a href="device/' . $device['device_id'] . '/routing/cef/' . $option . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $text
- . '</a>');
-  if ($_GET['optb'] == $option) { echo("</span>"); }
-  $sep = " | ";
-}
+if ($vars['view'] == "basic") { echo("<span class='pagemenu-selected'>"); }
+echo(generate_link("Basic", $link_array,array('view'=>'basic')));
+if ($vars['view'] == "basic") { echo("</span>"); }
 
-unset($sep);
+echo(" | ");
+
+if ($vars['view'] == "graphs") { echo("<span class='pagemenu-selected'>"); }
+echo(generate_link("Graphs", $link_array,array('view'=>'graphs')));
+if ($vars['view'] == "graphs") { echo("</span>"); }
 
 print_optionbar_end();
 
@@ -87,7 +85,7 @@ foreach (dbFetchRows("SELECT * FROM `cef_switching` WHERE `device_id` = ?  ORDER
         echo("</tr>
        ");
 
-  if ($_GET['optb'] == "graphs")
+  if ($vars['view'] == "graphs")
   {
     $graph_array['height'] = "100";
     $graph_array['width']  = "215";