diff --git a/html/includes/graphs/bgp_updates.inc.php b/html/includes/graphs/bgp_updates.inc.php
new file mode 100644
index 0000000000..56c5fa71f5
--- /dev/null
+++ b/html/includes/graphs/bgp_updates.inc.php
@@ -0,0 +1,24 @@
+<?php
+
+$data = mysql_fetch_array(mysql_query("SELECT * FROM bgpPeers AS B, devices AS D WHERE bgpPeer_id = '".$_GET['peer']."' AND D.device_id = B.device_id"));
+
+$rrd_filename = $config['rrd_dir'] . "/" . $data['hostname'] . "/bgp-" . $data['bgpPeerIdentifier'] . ".rrd";
+
+$rra_in = "bgpPeerInUpdates";
+$rra_out = "bgpPeerOutUpdates";
+
+$colour_area_in = "AA66AA";
+$colour_line_in = "330033";
+$colour_area_out = "FF6600";
+$colour_line_out = "FFDD88";
+
+$colour_area_in_max = "FFEE99";
+$colour_area_out_max = "FF7711";
+
+$graph_max = 1;
+
+$unit_text = "Updates";
+
+include("generic_duplex.inc.php");
+
+?>
diff --git a/html/includes/graphs/cbgp_prefixes.inc.php b/html/includes/graphs/cbgp_prefixes.inc.php
new file mode 100644
index 0000000000..2445c388cb
--- /dev/null
+++ b/html/includes/graphs/cbgp_prefixes.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+$data = mysql_fetch_array(mysql_query("SELECT * FROM bgpPeers AS B, devices AS D WHERE bgpPeer_id = '".$_GET['peer']."' AND D.device_id = B.device_id"));
+
+$rrd_filename = $config['rrd_dir'] . "/" . $data['hostname'] . "/cbgp-" . $data['bgpPeerIdentifier'] . ".".$_GET['afi'].".".$_GET['safi'].".rrd";
+
+$rra = "AcceptedPrefixes";
+
+$colour_area = "AA66AA";
+$colour_line = "FFDD88";
+
+$colour_area_max = "FFEE99";
+
+$graph_max = 1;
+
+$unit_text = "Prefixes";
+
+include("generic_simplex.inc.php");
+
+?>
diff --git a/html/includes/graphs/device_icmp.inc.php b/html/includes/graphs/device_icmp.inc.php
index e98ee77391..2732a936ff 100644
--- a/html/includes/graphs/device_icmp.inc.php
+++ b/html/includes/graphs/device_icmp.inc.php
@@ -2,7 +2,7 @@
 
   include("common.inc.php");
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netinfo.rrd";
+  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-icmp.rrd";
 
   $rrd_options .= " DEF:icmpInMsgs=$rrd_filename:icmpInMsgs:AVERAGE";
   $rrd_options .= " DEF:icmpOutMsgs=$rrd_filename:icmpOutMsgs:AVERAGE";
@@ -46,6 +46,4 @@
   $rrd_options .= " GPRINT:icmpOutEchoReps:AVERAGE:\ %6.2lf%s";
   $rrd_options .= " GPRINT:icmpOutEchoReps:MAX:\ %6.2lf%s\\\\n";
 
-
-
 ?>
diff --git a/html/includes/graphs/device_icmp_informational.inc.php b/html/includes/graphs/device_icmp_informational.inc.php
new file mode 100644
index 0000000000..2c22187126
--- /dev/null
+++ b/html/includes/graphs/device_icmp_informational.inc.php
@@ -0,0 +1,53 @@
+<?php
+
+include('common.inc.php');
+
+$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-icmp.rrd";
+
+$rrd_options .= " DEF:sqIn=$rrd_filename:icmpInSrcQuenchs:AVERAGE";
+$rrd_options .= " DEF:sqOut=$rrd_filename:icmpOutSrcQuenchs:AVERAGE";
+$rrd_options .= " DEF:redirIn=$rrd_filename:icmpInRedirects:AVERAGE";
+$rrd_options .= " DEF:redirOut=$rrd_filename:icmpOutRedirects:AVERAGE";
+$rrd_options .= " DEF:maskIn=$rrd_filename:icmpInAddrMasks:AVERAGE";
+$rrd_options .= " DEF:maskOut=$rrd_filename:icmpOutAddrMasks:AVERAGE";
+$rrd_options .= " DEF:maskrepIn=$rrd_filename:icmpInAddrMaskReps:AVERAGE";
+$rrd_options .= " DEF:maskrepOut=$rrd_filename:icmpOutAddrMaskReps:AVERAGE";
+$rrd_options .= " CDEF:sqOutInv=sqOut,-1,*";
+$rrd_options .= " CDEF:redirOutInv=redirOut,-1,*";
+$rrd_options .= " CDEF:maskOutInv=maskOut,-1,*";
+$rrd_options .= " CDEF:maskrepOutInv=maskrepOut,-1,*";
+$rrd_options .= " AREA:sqIn#00ff00:'Source Quenches In '";
+$rrd_options .= " GPRINT:sqIn:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:sqIn:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:sqIn:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " STACK:redirIn#0000ff:'Redirects In       '";
+$rrd_options .= " GPRINT:redirIn:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:redirIn:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:redirIn:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " STACK:maskIn#ff00b4:'Mask Requests In   '";
+$rrd_options .= " GPRINT:maskIn:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskIn:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskIn:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " STACK:maskrepIn#00ff72:'Mask Replies In    '";
+$rrd_options .= " GPRINT:maskrepIn:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskrepIn:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskrepIn:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " COMMENT:'\\n'";
+$rrd_options .= " AREA:sqOut#00ff00:'Source Quenches Out'";
+$rrd_options .= " GPRINT:sqOut:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:sqOut:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:sqOut:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " STACK:redirOut#0000ff:'Redirects Out      '";
+$rrd_options .= " GPRINT:redirOut:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:redirOut:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:redirOut:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " STACK:maskOut#ff00b4:'Mask Requests Out  '";
+$rrd_options .= " GPRINT:maskOut:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskOut:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskOut:MAX:'Max \\: %8.2lf %s\\n'";
+$rrd_options .= " STACK:maskrepOut#00ff72:'Mask Replies Out   '";
+$rrd_options .= " GPRINT:maskrepOut:AVERAGE:'Avg \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskrepOut:MIN:'Min \\: %8.2lf %s'";
+$rrd_options .= " GPRINT:maskrepOut:MAX:'Max \\: %8.2lf %s'";
+
+?>
diff --git a/html/includes/graphs/device_ip.inc.php b/html/includes/graphs/device_ip.inc.php
index 6e707a0ea0..6d84b9c880 100644
--- a/html/includes/graphs/device_ip.inc.php
+++ b/html/includes/graphs/device_ip.inc.php
@@ -1,56 +1,44 @@
 <?php
 
-include("common.inc.php");
+  include("common.inc.php");
 
-$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netinfo.rrd";
+  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-ip.rrd";
 
-$rrd_options .= " DEF:ipForwDatagrams=$rrd_filename:ipForwDatagrams:AVERAGE";
-$rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
-$rrd_options .= " DEF:ipInReceives=$rrd_filename:ipInReceives:AVERAGE";
-$rrd_options .= " DEF:ipOutRequests=$rrd_filename:ipOutRequests:AVERAGE";
-$rrd_options .= " DEF:ipInDiscards=$rrd_filename:ipInDiscards:AVERAGE";
-$rrd_options .= " DEF:ipOutDiscards=$rrd_filename:ipOutDiscards:AVERAGE";
-$rrd_options .= " DEF:ipOutNoRoutes=$rrd_filename:ipInDiscards:AVERAGE";
-
-$rrd_options .= " DEF:MipReasmReqds=$database:ipReasmReqds:MAX";
-$rrd_options .= " DEF:MipReasmOKs=$database:ipReasmOKs:MAX";
-$rrd_options .= " DEF:MipReasmFails=$database:ipReasmFails:MAX";
-$rrd_options .= " DEF:MipFragOKs=$database:ipFragOKs:MAX";
-$rrd_options .= " DEF:MipFragFails=$database:ipFragFails:MAX";
-$rrd_options .= " DEF:MipFragCreates=$database:ipFragCreates:MAX";
-# express all as a % of ipInDelivers
-# averages
-$rrd_options .= " CDEF:ReasmReqds=ipReasmReqds,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:ReasmOKs=ipReasmOKs,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:ReasmFails=ipReasmFails,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:FragOKs=ipFragOKs,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:FragFails=ipFragFails,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:FragCreates=ipFragCreates,ipInDelivers,/,100,*";
-# maximums
-$rrd_options .= " CDEF:MReasmReqds=MipReasmReqds,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:MReasmOKs=MipReasmOKs,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:MReasmFails=MipReasmFails,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:MFragOKs=MipFragOKs,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:MFragFails=MipFragFails,ipInDelivers,/,100,*";
-$rrd_options .= " CDEF:MFragCreates=MipFragCreates,ipInDelivers,/,100,*";
-# print some lines, with fails stacked on top
-$rrd_options .= " LINE1:FragOKs#00ff00:Fragmentation OK";
-$rrd_options .= " LINE2:FragFails#ff0000:Fragmentation Fail";
-$rrd_options .= " LINE1:ReasmOKs#0033aa:Reassembly OK";
-$rrd_options .= " LINE2:ReasmFails#000000:Reassembly Fail";
-# print some summary numbers.
-$rrd_options .= " GPRINT:ReasmReqds:AVERAGE:Avg ReasmReqd %1.2lf %%";
-$rrd_options .= " GPRINT:MReasmReqds:MAX:Max ReasmReqd %1.2lf %%";
-$rrd_options .= " GPRINT:ReasmOKs:AVERAGE:Avg ReasmOK %1.2lf %%";
-$rrd_options .= " GPRINT:MReasmOKs:MAX:Max ReasmOK %1.2lf %%";
-$rrd_options .= " GPRINT:ReasmFails:AVERAGE:Avg ReasmFail %1.2lf %%";
-$rrd_options .= " GPRINT:MReasmFails:MAX:Max ReasmFail %1.2lf %%";
-$rrd_options .= " GPRINT:FragOKs:AVERAGE:Avg FragOK %1.2lf %%";
-$rrd_options .= " GPRINT:MFragOKs:MAX:Max FragOK %1.2lf %%";
-$rrd_options .= " GPRINT:FragFails:AVERAGE:Avg FragFail %1.2lf %%";
-$rrd_options .= " GPRINT:MFragFails:MAX:Max FragFail %1.2lf %%";
-$rrd_options .= " GPRINT:FragCreates:AVERAGE:Avg FragCreate %1.2lf %%";
-$rrd_options .= " GPRINT:MFragCreates:MAX:Max FragCreate %1.2lf %%";
-$rrd_options .= " COMMENT:   Calculated as a % of ipInDelivers"
+  $rrd_options .= " DEF:ipForwDatagrams=$rrd_filename:ipForwDatagrams:AVERAGE";
+  $rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
+  $rrd_options .= " DEF:ipInReceives=$rrd_filename:ipInReceives:AVERAGE";
+  $rrd_options .= " DEF:ipOutRequests=$rrd_filename:ipOutRequests:AVERAGE";
+  $rrd_options .= " DEF:ipInDiscards=$rrd_filename:ipInDiscards:AVERAGE";
+  $rrd_options .= " DEF:ipOutDiscards=$rrd_filename:ipOutDiscards:AVERAGE";
+  $rrd_options .= " DEF:ipOutNoRoutes=$rrd_filename:ipInDiscards:AVERAGE";
+  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ Average\ \ \ Maximum\\\\n";
+  $rrd_options .= " LINE1.25:ipForwDatagrams#cc0000:ForwDgrams\ ";
+  $rrd_options .= " GPRINT:ipForwDatagrams:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipForwDatagrams:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipForwDatagrams:MAX:\ %6.2lf%s\\\\n";
+  $rrd_options .= " LINE1.25:ipInDelivers#00cc00:InDelivers\ ";
+  $rrd_options .= " GPRINT:ipInDelivers:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipInDelivers:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipInDelivers:MAX:\ %6.2lf%s\\\\n";
+  $rrd_options .= " LINE1.25:ipInReceives#006600:InReceives\ ";
+  $rrd_options .= " GPRINT:ipInReceives:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipInReceives:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipInReceives:MAX:\ %6.2lf%s\\\\n";
+  $rrd_options .= " LINE1.25:ipOutRequests#0000cc:OutRequests";
+  $rrd_options .= " GPRINT:ipOutRequests:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipOutRequests:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipOutRequests:MAX:\ %6.2lf%s\\\\n";
+  $rrd_options .= " LINE1.25:ipInDiscards#cccc00:InDiscards\ ";
+  $rrd_options .= " GPRINT:ipInDiscards:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipInDiscards:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipInDiscards:MAX:\ %6.2lf%s\\\\n";
+  $rrd_options .= " LINE1.25:ipOutDiscards#330033:OutDiscards";
+  $rrd_options .= " GPRINT:ipOutDiscards:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipOutDiscards:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipOutDiscards:MAX:\ %6.2lf%s\\\\n";
+  $rrd_options .= " LINE1.25:ipOutNoRoutes#660000:OutNoRoutes";
+  $rrd_options .= " GPRINT:ipOutNoRoutes:LAST:%6.2lf%s";
+  $rrd_options .= " GPRINT:ipOutNoRoutes:AVERAGE:\ %6.2lf%s";
+  $rrd_options .= " GPRINT:ipOutNoRoutes:MAX:\ %6.2lf%s\\\\n";
 
 ?>
diff --git a/html/includes/graphs/device_ipfrag.inc.php b/html/includes/graphs/device_ipfrag.inc.php
new file mode 100644
index 0000000000..4032d7f7cc
--- /dev/null
+++ b/html/includes/graphs/device_ipfrag.inc.php
@@ -0,0 +1,51 @@
+<?php
+
+include("common.inc.php");
+
+$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-ip.rrd";
+
+
+$rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
+$rrd_options .= " DEF:ipReasmReqds=$rrd_filename:ipReasmReqds:AVERAGE";
+$rrd_options .= " DEF:ipReasmOKs=$rrd_filename:ipReasmOKs:AVERAGE";
+$rrd_options .= " DEF:ipReasmFails=$rrd_filename:ipReasmFails:AVERAGE";
+$rrd_options .= " DEF:ipFragOKs=$rrd_filename:ipFragOKs:AVERAGE";
+$rrd_options .= " DEF:ipFragFails=$rrd_filename:ipFragFails:AVERAGE";
+$rrd_options .= " DEF:ipFragCreates=$rrd_filename:ipFragCreates:AVERAGE";
+$rrd_options .= " DEF:MipReasmReqds=$rrd_filename:ipReasmReqds:MAX";
+$rrd_options .= " DEF:MipReasmOKs=$rrd_filename:ipReasmOKs:MAX";
+$rrd_options .= " DEF:MipReasmFails=$rrd_filename:ipReasmFails:MAX";
+$rrd_options .= " DEF:MipFragOKs=$rrd_filename:ipFragOKs:MAX";
+$rrd_options .= " DEF:MipFragFails=$rrd_filename:ipFragFails:MAX";
+$rrd_options .= " DEF:MipFragCreates=$rrd_filename:ipFragCreates:MAX";
+$rrd_options .= " CDEF:ReasmReqds=ipReasmReqds,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:ReasmOKs=ipReasmOKs,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:ReasmFails=ipReasmFails,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:FragOKs=ipFragOKs,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:FragFails=ipFragFails,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:FragCreates=ipFragCreates,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:MReasmReqds=MipReasmReqds,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:MReasmOKs=MipReasmOKs,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:MReasmFails=MipReasmFails,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:MFragOKs=MipFragOKs,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:MFragFails=MipFragFails,ipInDelivers,/,100,*";
+$rrd_options .= " CDEF:MFragCreates=MipFragCreates,ipInDelivers,/,100,*";
+$rrd_options .= " LINE1:FragOKs#00ff00:'Fragmentation OK'";
+$rrd_options .= " LINE2:FragFails#ff0000:'Fragmentation Fail'";
+$rrd_options .= " LINE1:ReasmOKs#0033aa:'Reassembly OK'";
+$rrd_options .= " LINE2:ReasmFails#000000:'Reassembly Fail'";
+$rrd_options .= " GPRINT:ReasmReqds:AVERAGE:Avg\ ReasmReqd\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:MReasmReqds:MAX:Max\ ReasmReqd\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:ReasmOKs:AVERAGE:Avg\ ReasmOK\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:MReasmOKs:MAX:Max\ ReasmOK\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:ReasmFails:AVERAGE:Avg\ ReasmFail\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:MReasmFails:MAX:Max\ ReasmFail\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:FragOKs:AVERAGE:Avg\ FragOK\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:MFragOKs:MAX:Max\ FragOK\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:FragFails:AVERAGE:Avg\ FragFail\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:MFragFails:MAX:Max\ FragFail\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:FragCreates:AVERAGE:Avg\ FragCreate\ %1.2lf\ %%";
+$rrd_options .= " GPRINT:MFragCreates:MAX:Max\ FragCreate\ %1.2lf\ %%";
+$rrd_options .= " COMMENT:'   Calculated as a % of ipInDelivers'"
+
+?>
diff --git a/html/includes/graphs/device_tcp.inc.php b/html/includes/graphs/device_tcp.inc.php
index a0020f0c36..3ce17fbdf2 100644
--- a/html/includes/graphs/device_tcp.inc.php
+++ b/html/includes/graphs/device_tcp.inc.php
@@ -2,9 +2,8 @@
 
   include("common.inc.php");
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netinfo.rrd";
+  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-tcp.rrd";
 
-  $rrd_options .= " DEF:icmpInMsgs=$rrd_filename:icmpInMsgs:AVERAGE";
   $rrd_options .= " DEF:tcpActiveOpens=$rrd_filename:tcpActiveOpens:AVERAGE";
   $rrd_options .= " DEF:tcpPassiveOpens=$rrd_filename:tcpPassiveOpens:AVERAGE";
   $rrd_options .= " DEF:tcpAttemptFails=$rrd_filename:tcpAttemptFails:AVERAGE";
diff --git a/html/includes/graphs/device_udp.inc.php b/html/includes/graphs/device_udp.inc.php
index b49aba5c73..2d4bb2da63 100644
--- a/html/includes/graphs/device_udp.inc.php
+++ b/html/includes/graphs/device_udp.inc.php
@@ -2,9 +2,8 @@
 
   include("common.inc.php");
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netinfo.rrd";
+  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-udp.rrd";
 
-  $rrd_options .= " DEF:icmpInMsgs=$rrd_filename:icmpInMsgs:AVERAGE";
   $rrd_options .= " DEF:udpInDatagrams=$rrd_filename:udpInDatagrams:AVERAGE";
   $rrd_options .= " DEF:udpOutDatagrams=$rrd_filename:udpOutDatagrams:AVERAGE";
   $rrd_options .= " DEF:udpInErrors=$rrd_filename:udpInErrors:AVERAGE";
diff --git a/html/includes/graphs/generic_duplex.inc.php b/html/includes/graphs/generic_duplex.inc.php
index 350616a3ef..5cf52ed3f3 100644
--- a/html/includes/graphs/generic_duplex.inc.php
+++ b/html/includes/graphs/generic_duplex.inc.php
@@ -5,7 +5,8 @@
 
 include("common.inc.php");
 
-if(!$unit_text) {$unit_text = "\ \ \ \ \ \ \ ";}
+
+$unit_text = str_pad(truncate($unit_text,10),10);
 
 $rrd_options .= " DEF:".$out."=".$rrd_filename.":".$rra_out.":AVERAGE";
 $rrd_options .= " DEF:".$in."=".$rrd_filename.":".$rra_in.":AVERAGE";
@@ -33,11 +34,11 @@ if($graph_max) {
   $rrd_options .= " AREA:dout_max#".$colour_area_out_max.":";
 }
 $rrd_options .= " AREA:in#".$colour_area_in.":";
-$rrd_options .= " COMMENT:".$unit_text."Now\ \ \ \ \ \ \ Ave\ \ \ \ \ \ Max";
+$rrd_options .= " COMMENT:'".$unit_text."Now       Ave      Max";
 if($percentile) {
-  $rrd_options .= "\ \ \ \ \ \ ".$percentile."th\ %\\\\n";
+  $rrd_options .= "      ".$percentile."th %";
 }
-$rrd_options .= "\\\\n";
+$rrd_options .= "\\n'";
 $rrd_options .= " LINE1.25:in#".$colour_line_in.":In\ ";
 $rrd_options .= " GPRINT:in:LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:in:AVERAGE:%6.2lf%s";
diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php
index b107408879..412af42c4d 100644
--- a/html/includes/graphs/generic_simplex.inc.php
+++ b/html/includes/graphs/generic_simplex.inc.php
@@ -5,42 +5,42 @@
 
 include("common.inc.php");
 
-if(!$unit_text) {$unit_text = "\ \ \ \ \ \ \ ";}
+$unit_text = str_pad(truncate($unit_text,10),10);
 
-$rrd_options .= " DEF:".$in."=".$rrd_filename.":".$rra_in.":AVERAGE";
-$rrd_options .= " DEF:".$in."_max=".$rrd_filename.":".$rra_out.":MAX";
+$rrd_options .= " DEF:".$rra."=".$rrd_filename.":".$rra.":AVERAGE";
+$rrd_options .= " DEF:".$rra."_max=".$rrd_filename.":".$rra.":MAX";
 
 if($print_total) {
-  $rrd_options .= " VDEF:totin=in,TOTAL";
+  $rrd_options .= " VDEF:".$rra."_total=rra,TOTAL";
 }
 
 if($percentile) {
-  $rrd_options .= " VDEF:percentile_in=in,".$percentile.",PERCENT";
+  $rrd_options .= " VDEF:".$rra."_percentile=".$rra.",".$percentile.",PERCENT";
 }
 
 if($graph_max) {
-  $rrd_options .= " AREA:in_max#".$colour_area_in_max.":";
+  $rrd_options .= " AREA:".$rra."_max#".$colour_area_max.":";
 }
-$rrd_options .= " AREA:in#".$colour_area_in.":";
-$rrd_options .= " COMMENT:".$unit_text."Now\ \ \ \ \ \ \ Ave\ \ \ \ \ \ Max";
+$rrd_options .= " AREA:".$rra."#".$colour_area.":";
+$rrd_options .= " COMMENT:'".$unit_text."Now       Ave      Max";
 if($percentile) {
-  $rrd_options .= "\ \ \ \ \ \ ".$percentile."th\ %\\\\n";
+  $rrd_options .= "\ \ \ \ \ \ ".$percentile."th\ %";
 }
-$rrd_options .= "\\\\n";
-$rrd_options .= " LINE1.25:in#".$colour_line_in.":In\ ";
-$rrd_options .= " GPRINT:in:LAST:%6.2lf%s";
-$rrd_options .= " GPRINT:in:AVERAGE:%6.2lf%s";
-$rrd_options .= " GPRINT:in_max:MAX:%6.2lf%s";
+$rrd_options .= "\\n'";
+$rrd_options .= " LINE1.25:".$rra."#".$colour_line.":In\ ";
+$rrd_options .= " GPRINT:".$rra.":LAST:%6.2lf%s";
+$rrd_options .= " GPRINT:".$rra.":AVERAGE:%6.2lf%s";
+$rrd_options .= " GPRINT:".$rra."_max:MAX:%6.2lf%s";
 if($percentile) {
-  $rrd_options .= " GPRINT:percentile_in:%6.2lf%s";
+  $rrd_options .= " GPRINT:".$rra."_percentile:%6.2lf%s";
 }
 $rrd_options .= "\\\\n";
 $rrd_options .= " COMMENT:\\\\n";
 if($print_total) {
-  $rrd_options .= " GPRINT:tot:Total\ %6.2lf%s\)\\\\l";
+  $rrd_options .= " GPRINT:".$rra."_tot:Total\ %6.2lf%s\)\\\\l";
 }
 if($percentile) {
-  $rrd_options .= " LINE1:percentile_in#aa0000";
+  $rrd_options .= " LINE1:".$rra."_percentile#aa0000";
 }
 
 ?>