diff --git a/html/css/styles-wide.css b/html/css/styles-wide.css
index bad68baf68..e644a54d7b 100644
--- a/html/css/styles-wide.css
+++ b/html/css/styles-wide.css
@@ -6,3 +6,4 @@
   margin:0 auto;
   width: 1776px;
 }
+
diff --git a/html/css/styles.css b/html/css/styles.css
index 3e1f837fb1..03dcca23a4 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -831,7 +831,6 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover {
 
 .contentstyle {
   border: 1px solid #aaaaaa;
-  width: 1176px;
   margin-bottom: 1em;
   padding: 10px;
   float: left;
diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php
index 2b1964fb4e..55c94c470b 100644
--- a/html/includes/graphs/generic_multi_bits_separated.inc.php
+++ b/html/includes/graphs/generic_multi_bits_separated.inc.php
@@ -65,10 +65,11 @@ foreach ($rrd_list as $rrd)
 
   if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; }
 
-  $rrd_options .= " 'AREA:outB".$i."_neg#" . $colour_out . ":".$descr_out.":$stack'";
-  $rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units";
-  $rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s$units";
-  $rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units\l";
+  $rrd_options  .= " 'HRULE:0#" . $colour_out.":".$descr_out."'";
+  $rrd_optionsb .= " 'AREA:outB".$i."_neg#" . $colour_out . "::$stack'";
+  $rrd_options  .= " GPRINT:outB".$i.":LAST:%6.2lf%s$units";
+  $rrd_options  .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s$units";
+  $rrd_options  .= " GPRINT:outB".$i.":MAX:%6.2lf%s$units\l";
 
   if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }
 
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 33da73e7f6..ba151f5c6c 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -247,12 +247,14 @@ if($format == "graph")
       {
         $graph_type = "device_".$subformat;
 
-        echo("<div style='display: block; padding: 1px; margin: 2px; min-width: 393px; max-width:393px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
+	if($_SESSION['widescreen']) { $width=270; } else { $width=315; }
+
+        echo("<div style='display: block; padding: 1px; margin: 2px; min-width: ".($width+78)."px; max-width:".($width+78)."px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
         <a href='device/device=".$device['device_id']."/' onmouseover=\"return overlib('\
         <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\
         <img src=\'graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=450&amp;height=150&amp;title=yes\'>\
         ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".
-        "<img src='graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=315&amp;height=110&amp;legend=no&amp;title=yes'>
+        "<img src='graph.php?type=$graph_type&amp;id=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=".$width."&amp;height=110&amp;legend=no&amp;title=yes'>
         </a>
         </div>");
       }