diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index a4718a3895..1fa6ccddbc 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -3,11 +3,11 @@
   include("includes/graphs/common.inc.php");
 
   $i = 0;
-  $rrd_options .= " COMMENT:'                               In\: Current     Maximum      '";
+  $rrd_options .= " COMMENT:'                     In\: Current     Maximum      '";
   if(!$nototal) {$rrd_options .= " COMMENT:'Total      '";}
   $rrd_options .= " COMMENT:'Out\: Current     Maximum'";
   if(!$nototal) {$rrd_options .= " COMMENT:'     Total'";}
-  $rrd_options .= " COMMENT:'\\\\n'";
+  $rrd_options .= " COMMENT:'\\n'";
 
   foreach($rrd_list as $rrd) {
       if(!$config['graph_colours'][$colours_in][$iter] || !$config['graph_colours'][$colours_out][$iter]) { $iter = 0; }
@@ -15,6 +15,8 @@
       $colour_in=$config['graph_colours'][$colours_in][$iter];
       $colour_out=$config['graph_colours'][$colours_out][$iter];
 
+      $descr = str_replace(":", "\:", substr(str_pad($rrd['descr'], 18),0,18));
+
       $rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$rra_in.":AVERAGE ";
       $rrd_options .= " DEF:".$out.$i."=".$rrd['filename'].":".$rra_out.":AVERAGE ";
       $rrd_options .= " CDEF:inB".$i."=in".$i.",$multiplier,* ";
@@ -28,7 +30,7 @@
       }
       $rrd_options .= " HRULE:999999999999999#" . $colour_out . ":\\\s:";
       if($i) {$stack="STACK";}
-      $rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . substr(str_pad($rrd['descr'], 18),0,18) . "':$stack";
+      $rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . $descr . "':$stack";
       $rrd_optionsb .= " AREA:outB".$i."_neg#" . $colour_out . "::$stack";
       $rrd_options .= " GPRINT:inB".$i.":LAST:%6.2lf%s$units";
       $rrd_options .= " GPRINT:inB".$i.":MAX:%6.2lf%s$units";
diff --git a/html/pages/device/apps/apache.inc.php b/html/pages/device/apps/apache.inc.php
new file mode 100644
index 0000000000..1768708ba6
--- /dev/null
+++ b/html/pages/device/apps/apache.inc.php
@@ -0,0 +1,34 @@
+<?php
+
+  global $config;
+
+$graphs = array('apache_bytes' => 'Traffic - Bytes/sec',
+                'apache_hits' => 'Traffic - Hits',
+                'apache_cpu'  => 'CPU Utilisation',
+                'apache_scoreboard' => 'Scoreboard Statistics');
+
+foreach($graphs as $key => $text) {
+
+  $graph_type = "apache_scoreboard";
+
+  $graph_array['height'] = "100";
+  $graph_array['width']  = "215";
+  $graph_array['to']     = $now;
+  $graph_array['id']     = $app['app_id'];
+  $graph_array['type']   = "application_".$key;
+
+  echo('<h3>'.$text.'</h3>');
+
+  echo("<tr bgcolor='$row_colour'><td colspan=5>");
+
+
+  include("includes/print-quadgraphs.inc.php");
+
+
+  echo("</td></tr>");
+
+
+
+}
+
+?>