diff --git a/check-services.php b/check-services.php
index cc979f147..fcbc47df1 100755
--- a/check-services.php
+++ b/check-services.php
@@ -3,6 +3,8 @@
 
 chdir(dirname($argv[0]));
 
+$debug=1;
+
 include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
@@ -58,16 +60,15 @@ foreach (dbFetchRows("SELECT * FROM `devices` AS D, `services` AS S WHERE S.devi
 
   if (!is_file($rrd))
   {
-    rrdtool_create($rrd,"--step 300 \
-      DS:status:GAUGE:600:0:1 \
-      RRA:AVERAGE:0.5:1:1200 \
-      RRA:AVERAGE:0.5:12:2400");
+    rrdtool_create ($rrd, "DS:status:GAUGE:600:0:1 ".$config['rrd_rra']);
   }
-
   if ($status == "1" || $status == "0")
   {
     rrdtool_update($rrd,"N:".$status);
+  } else {
+    rrdtool_update($rrd,"N:U");
   }
+
 } # while
 
 ?>
diff --git a/html/includes/print-service.inc.php b/html/includes/print-service.inc.php
index bb3be51f2..8d776cd7d 100644
--- a/html/includes/print-service.inc.php
+++ b/html/includes/print-service.inc.php
@@ -36,8 +36,6 @@ if ($device_id)
 {
   if (!$samehost)
   {
-    $device['device_id'] = $device_id;
-    $device['hostname'] = $device_hostname;
     echo("<td valign=top width=250><span style='font-weight:bold;'>" . generate_device_link($device) . "</span></td>");
   } else {
     echo("<td></td>");
diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php
index 4da2e840b..87918c917 100644
--- a/html/pages/device/services.inc.php
+++ b/html/pages/device/services.inc.php
@@ -5,21 +5,16 @@ echo("<span style='font-weight: bold;'>Services</span> &#187; ");
 $menu_options = array('basic' => 'Basic',
                       'details' => 'Details');
 
-if (!$_GET['optc']) { $_GET['optc'] = "basic"; }
+if (!$vars['view']) { $vars['view'] = "basic"; }
 
 $sep = "";
 foreach ($menu_options as $option => $text)
 {
+  if(empty($vars['view'])) { $vars['view'] = $option; }
   echo($sep);
-  if ($_GET['optc'] == $option)
-  {
-    echo("<span class='pagemenu-selected'>");
-  }
-  echo('<a href="device/' . $device['device_id'] . '/services/' . $option . ($_GET['optd'] ? '/' . $_GET['optd'] : ''). '/">' . $text . '</a>');
-  if ($_GET['optc'] == $option)
-  {
-    echo("</span>");
-  }
+  if ($vars['view'] == $option) { echo("<span class='pagemenu-selected'>"); }
+  echo(generate_link($text, $vars, array('view'=>$option)));
+  if ($vars['view'] == $option) { echo("</span>"); }
   $sep = " | ";
 }
 
@@ -35,7 +30,7 @@ if (dbFetchCell("SELECT COUNT(service_id) FROM `services` WHERE device_id = ?",
   {
     include("includes/print-service.inc.php");
 
-       if ($_GET['optc'] == "details")
+       if ($vars['view'] == "details")
        {
          $graph_array['height'] = "100";
          $graph_array['width']  = "210";
@@ -46,12 +41,9 @@ if (dbFetchCell("SELECT COUNT(service_id) FROM `services` WHERE device_id = ?",
          $periods = array('day', 'week', 'month', 'year');
 
          echo('<tr style="background-color: '.$bg.'; padding: 7px;"><td colspan=4>');
-         foreach ($periods as $period)
-         {
-           $graph_array['from'] = $$period;
-           $graph_array_zoom   = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
-           echo(overlib_link("#", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
-         }
+
+         include("includes/print-quadgraphs.inc.php");
+
          echo("</td></tr>");
        }
   }
diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php
index ae7742434..870310edb 100644
--- a/html/pages/services.inc.php
+++ b/html/pages/services.inc.php
@@ -4,26 +4,21 @@ $pagetitle[] = "Services";
 
 print_optionbar_start();
 
- echo('<span style="font-weight: bold;">Services</span> &#187; ');
+echo("<span style='font-weight: bold;'>Services</span> &#187; ");
 
 $menu_options = array('basic' => 'Basic',
                       'details' => 'Details');
 
-if (!$_GET['opta']) { $_GET['opta'] = "basic"; }
+if (!$vars['view']) { $vars['view'] = "basic"; }
 
 $sep = "";
 foreach ($menu_options as $option => $text)
 {
+  if(empty($vars['view'])) { $vars['view'] = $option; }
   echo($sep);
-  if ($_GET['opta'] == $option)
-  {
-    echo("<span class='pagemenu-selected'>");
-  }
-  echo('<a href="services/' . $option . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $text . '</a>');
-  if ($_GET['opta'] == $option)
-  {
-    echo("</span>");
-  }
+  if ($vars['view'] == $option) { echo("<span class='pagemenu-selected'>"); }
+  echo(generate_link($text, $vars, array('view'=>$option)));
+  if ($vars['view'] == $option) { echo("</span>"); }
   $sep = " | ";
 }
 
@@ -44,16 +39,16 @@ if ($_SESSION['userlevel'] >= '5')
   $host_sql = "SELECT * FROM devices AS D, services AS S, devices_perms AS P WHERE D.device_id = S.device_id AND D.device_id = P.device_id AND P.user_id = ? GROUP BY D.hostname ORDER BY D.hostname";
   $host_par = array($_SESSION['user_id']);
 }
-  foreach (dbFetchRows($host_sql, $host_par) as $host_data)
+  foreach (dbFetchRows($host_sql, $host_par) as $device)
   {
-    $device_id = $host_data['device_id'];
-    $device_hostname = $host_data['hostname'];
-    foreach (dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ?", array($host_data['device_id'])) as $service)
+    $device_id = $device['device_id'];
+    $device_hostname = $device['hostname'];
+    foreach (dbFetchRows("SELECT * FROM `services` WHERE `device_id` = ?", array($device['device_id'])) as $service)
     {
        include("includes/print-service.inc.php");
 
 #       $samehost = 1;
-       if ($_GET['opta'] == "details")
+       if ($vars['view'] == "details")
        {
          $graph_array['height'] = "100";
          $graph_array['width']  = "215";