diff --git a/html/includes/graphs/customer/bits.inc.php b/html/includes/graphs/customer/bits.inc.php
index 0869dcba2..4f51bc21c 100644
--- a/html/includes/graphs/customer/bits.inc.php
+++ b/html/includes/graphs/customer/bits.inc.php
@@ -1,23 +1,31 @@
 <?php
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
-
-foreach(dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = ? AND D.device_id = I.device_id", array($_GET['id'])) as $int)
+$i=0;
+foreach(dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = ? AND D.device_id = I.device_id", array($id)) as $port)
 {
-  if (is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")))
+  if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd")))
   {
-    $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
+    $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
+    $rrd_list[$i]['filename'] = $rrd_filename;
+    $rrd_list[$i]['descr'] = $port['hostname'] ."-". $port['ifDescr'];
+    $i++;
   }
 }
 
+#echo($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"));
+
+$units ='bps';
+$total_units ='B';
+$colours_in ='greens';
+$multiplier = "8";
+$colours_out = 'blues';
+
+$nototal = 1;
+
 $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");
+include("includes/graphs/generic_multi_bits_separated.inc.php");
 
 ?>
diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index d6efbd755..1cabbc462 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -55,6 +55,9 @@ foreach ($rrd_list as $rrd)
   $i++; $iter++;
 }
 
+
+
+
 if ($custom_graph) { $rrd_options .= $custom_graph; }
 
 $rrd_options .= $rrd_optionsb;
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 51b392a85..67c427c66 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -262,11 +262,11 @@ if ($_SESSION['userlevel'] >= '5')
 {
   echo('<li><hr width="140" /></li>');
   if ($config['int_customers']) { echo('<li><a href="customers/"><img src="images/16/group_link.png" border="0" align="absmiddle" /> Customers</a></li>'); $ifbreak = 1; }
-  if ($config['int_l2tp']) { echo('<li><a href="iftype/l2tp/"><img src="images/16/user.png" border="0" align="absmiddle" /> L2TP</a></li>'); $ifbreak = 1; }
-  if ($config['int_transit']) { echo('<li><a href="iftype/transit/"><img src="images/16/lorry_link.png" border="0" align="absmiddle" /> Transit</a></li>');  $ifbreak = 1; }
-  if ($config['int_peering']) { echo('<li><a href="iftype/peering/"><img src="images/16/bug_link.png" border="0" align="absmiddle" /> Peering</a></li>'); $ifbreak = 1; }
-  if ($config['int_peering'] && $config['int_transit']) { echo('<li><a href="iftype/peering,transit/"><img src="images/16/world_link.png" border="0" align="absmiddle" /> Peering + Transit</a></li>'); $ifbreak = 1; }
-  if ($config['int_core']) { echo('<li><a href="iftype/core/"><img src="images/16/brick_link.png" border="0" align="absmiddle" /> Core</a></li>'); $ifbreak = 1; }
+  if ($config['int_l2tp']) { echo('<li><a href="iftype/type=l2tp/"><img src="images/16/user.png" border="0" align="absmiddle" /> L2TP</a></li>'); $ifbreak = 1; }
+  if ($config['int_transit']) { echo('<li><a href="iftype/type=transit/"><img src="images/16/lorry_link.png" border="0" align="absmiddle" /> Transit</a></li>');  $ifbreak = 1; }
+  if ($config['int_peering']) { echo('<li><a href="iftype/type=peering/"><img src="images/16/bug_link.png" border="0" align="absmiddle" /> Peering</a></li>'); $ifbreak = 1; }
+  if ($config['int_peering'] && $config['int_transit']) { echo('<li><a href="iftype/type=peering,transit/"><img src="images/16/world_link.png" border="0" align="absmiddle" /> Peering + Transit</a></li>'); $ifbreak = 1; }
+  if ($config['int_core']) { echo('<li><a href="iftype/type=core/"><img src="images/16/brick_link.png" border="0" align="absmiddle" /> Core</a></li>'); $ifbreak = 1; }
 }
 
 if ($ifbreak) { echo('<li><hr width="140" /></li>'); }
diff --git a/html/pages/iftype.inc.php b/html/pages/iftype.inc.php
index 62c3b0ecc..6f8e43c28 100644
--- a/html/pages/iftype.inc.php
+++ b/html/pages/iftype.inc.php
@@ -5,7 +5,7 @@
 if ($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg = "#ffffff"; }
 
 $type_where = " (";
-foreach (explode(",", $_GET['opta']) as $type)
+foreach (explode(",", $vars['type']) as $type)
 {
   $type_where .= " $or `port_descr_type` = ?";
   $or = "OR";
@@ -15,15 +15,14 @@ foreach (explode(",", $_GET['opta']) as $type)
 $type_where .= ") ";
 $ports = dbFetchRows("SELECT * FROM `ports` as I, `devices` AS D WHERE $type_where AND I.device_id = D.device_id ORDER BY I.ifAlias", $type_param);
 
-
-foreach ($ports as $interface)
+foreach ($ports as $port)
 {
-  $if_list .= $seperator . $interface['interface_id'];
+  $if_list .= $seperator . $port['interface_id'];
   $seperator = ",";
 }
 unset($seperator);
 
-$types_array = explode(',',$_GET['opta']);
+$types_array = explode(',',$vars['type']);
 for ($i = 0; $i < count($types_array);$i++) $types_array[$i] = ucfirst($types_array[$i]);
 $types = implode(' + ',$types_array);
 
@@ -33,31 +32,31 @@ echo("<tr bgcolor='$bg'>
 if ($if_list)
 {
   echo("<tr bgcolor='$bg'><td>");
-  $graph_type = "multiport_bits";
-  $interface['interface_id'] = $if_list;
+  $graph_type = "multiport_bits_separate";
+  $port['interface_id'] = $if_list;
   include("includes/print-interface-graphs.inc.php");
   echo("</td></tr>");
 
-  foreach ($ports as $interface)
+  foreach ($ports as $port)
   {
     $done = "yes";
     unset($class);
-    $interface['ifAlias'] = str_ireplace($type . ": ", "", $interface['ifAlias']);
-    $interface['ifAlias'] = str_ireplace("[PNI]", "Private", $interface['ifAlias']);
-    $ifclass = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']);
+    $port['ifAlias'] = str_ireplace($type . ": ", "", $port['ifAlias']);
+    $port['ifAlias'] = str_ireplace("[PNI]", "Private", $port['ifAlias']);
+    $ifclass = ifclass($port['ifOperStatus'], $port['ifAdminStatus']);
     if ($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg = "#ffffff"; }
     echo("<tr bgcolor='$bg'>
-             <td><span class=list-large>" . generate_port_link($interface,$interface['port_descr_descr']) . "</span><br />
-            <span class=interface-desc style='float: left;'>".generate_device_link($interface)." ".generate_port_link($interface)." </span>");
+             <td><span class=list-large>" . generate_port_link($port,$port['port_descr_descr']) . "</span><br />
+            <span class=interface-desc style='float: left;'>".generate_device_link($port)." ".generate_port_link($port)." </span>");
 
-    if (dbFetchCell("SELECT count(*) FROM mac_accounting WHERE interface_id = ?", array($interface['interface_id'])))
+    if (dbFetchCell("SELECT count(*) FROM mac_accounting WHERE interface_id = ?", array($port['interface_id'])))
     {
-      echo("<span style='float: right;'><a href='device/".$interface['device_id']."/port/".$interface['interface_id']."/macaccounting/'><img src='/images/16/chart_curve.png' align='absmiddle'> MAC Accounting</a></span>");
+      echo("<span style='float: right;'><a href='device/".$port['device_id']."/port/".$port['interface_id']."/macaccounting/'><img src='/images/16/chart_curve.png' align='absmiddle'> MAC Accounting</a></span>");
     }
 
     echo("</td></tr><tr bgcolor='$bg'><td>");
 
-    if (file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/port-" . $interface['ifIndex'] . ".rrd"))
+    if (file_exists($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . $port['ifIndex'] . ".rrd"))
     {
       $graph_type = "port_bits";
       include("includes/print-interface-graphs.inc.php");