diff --git a/html/includes/graphs/device/smokeping_in_all.inc.php b/html/includes/graphs/device/smokeping_in_all.inc.php
index 7e5d86568..73462d4a2 100644
--- a/html/includes/graphs/device/smokeping_in_all.inc.php
+++ b/html/includes/graphs/device/smokeping_in_all.inc.php
@@ -1,36 +1,9 @@
 <?php
 
-    $files      = array();
-
-    if ($handle = opendir($config['smokeping']['dir']))
-    {
-        while (false !== ($file = readdir($handle)))
-        {
-            if ($file != "." && $file != "..")
-            {
-                if (eregi(".rrd", $file))
-                {
-                   if (eregi("~", $file))
-                   {
-                      list($target,$slave) = explode("~", str_replace(".rrd", "", $file));
-                      if($target == $device['hostname'])
-                      {
-                        $files[$slave] = $file;
-                      }
-                   } else {
-                      $target = str_replace(".rrd", "", $file);
-                      if($target == $device['hostname'])
-                      {
-                        $files['observium'] = $file;
-                      }
-                   }
-                }
-            }
-        }
-    }
+include("smokeping_common.inc.php");
 
 $i=0;
-foreach($files as $source => $filename)
+foreach($smokeping_files['in'][$device['hostname']] as $source => $filename)
 {
   $i++;
   $rrd_list[$i]['filename'] = $config['smokeping']['dir'] . $filename;
diff --git a/html/includes/graphs/device/smokeping_out_all.inc.php b/html/includes/graphs/device/smokeping_out_all.inc.php
index 81d4047bb..bd8461ff4 100644
--- a/html/includes/graphs/device/smokeping_out_all.inc.php
+++ b/html/includes/graphs/device/smokeping_out_all.inc.php
@@ -1,31 +1,10 @@
 <?php
 
-    $config['smokeping']['dir']     = "/var/lib/smokeping/";
-    $files      = array();
-
-    if ($handle = opendir($config['smokeping']['dir']))
-    {
-        while (false !== ($file = readdir($handle)))
-        {
-            if ($file != "." && $file != "..")
-            {
-                if (eregi(".rrd", $file))
-                {
-                   if (eregi("~", $file))
-                   {
-                      list($target,$slave) = explode("~", str_replace(".rrd", "", $file));
-                      if($slave == $device['hostname'])
-                      {
-                        $files[$target] = $file;
-                      }
-                   }
-                }
-            }
-        }
-    }
-
 $i=0;
-foreach($files as $source => $filename)
+
+include("smokeping_common.inc.php");
+
+foreach($smokeping_files['out'][$device['hostname']] as $source => $filename)
 {
   $i++;
   $rrd_list[$i]['filename'] = $config['smokeping']['dir'] . $filename;
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 70ed6a7be..a25965c03 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -75,7 +75,7 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
-    if (is_dir($config['collectd_dir'] . "/" . $device['hostname'] ."/"))
+    if (isset($config['collectd_dir']) && is_dir($config['collectd_dir'] . "/" . $device['hostname'] ."/"))
     {
       echo('<li class="' . $select['collectd'] . '">
     <a href="'.generate_device_url($device, array('tab' => 'collectd')).'">
@@ -93,6 +93,37 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
+  if(isset($config['smokeping']['dir'])) {
+    $smokeping_files      = array();
+    if ($handle = opendir($config['smokeping']['dir'])) {
+        while (false !== ($file = readdir($handle))) {
+            if ($file != "." && $file != "..") {
+                if (eregi(".rrd", $file)) {
+                   if (eregi("~", $file)) {
+                      list($target,$slave) = explode("~", str_replace(".rrd", "", $file));
+                      $smokeping_files['in'][$target][$slave] = $file;
+                      $smokeping_files['out'][$slave][$target] = $file;
+                   } else {
+                      $target = str_replace(".rrd", "", $file);
+                      $smokeping_files['in'][$target][$config['own_hostname']] = $file;
+                      $smokeping_files['out'][$config['own_hostname']][$target] = $file;
+                   }
+                }
+            }
+        }
+    }
+ }
+
+
+    if (count($smokeping_files))
+    {
+      echo('<li class="' . $select['latency'] . '">
+    <a href="'.generate_device_url($device, array('tab' => 'latency')).'">
+      <img src="images/16/arrow_undo.png" align="absmiddle" border="0" /> Latency
+    </a>
+  </li>');
+    }
+
     if (@dbFetchCell("SELECT COUNT(vlan_id) FROM vlans WHERE device_id = '" . $device['device_id'] . "'") > '0')
     {
       echo('<li class="' . $select['vlans'] . '">
diff --git a/html/pages/device/latency.inc.php b/html/pages/device/latency.inc.php
index 26badc523..49305899b 100644
--- a/html/pages/device/latency.inc.php
+++ b/html/pages/device/latency.inc.php
@@ -1,32 +1,39 @@
 <?php
 
-#if(!$vars['view']) { $vars['view'] = "incoming"; }
 if(!$vars['view']) { $vars['view'] = "outgoing"; }
 
-    $files      = array();
+print_optionbar_start();
 
-    if ($handle = opendir($config['smokeping']['dir'])) {
-        while (false !== ($file = readdir($handle))) {
-            if ($file != "." && $file != "..") {
-                if (eregi(".rrd", $file)) {
-                   if (eregi("~", $file)) {
-                      list($target,$slave) = explode("~", str_replace(".rrd", "", $file));
-                      $files[$target][$slave] = $file;
-                      $files_rev[$slave][$target] = $file;
-                   } else {
-                      $target = str_replace(".rrd", "", $file);
-                      $files[$target]['observium'] = $file;
-                   }
-                }
-            }
-        }
-    }
+echo("<span style='font-weight: bold;'>Latency</span> &#187; ");
+
+$menu_options = array('incoming' => 'Incoming',
+                      'outgoing' => 'Outgoing');
+
+$sep = "";
+foreach ($menu_options as $option => $text)
+{
+  echo($sep);
+  if ($vars['view'] == $option)
+  {
+    echo("<span class='pagemenu-selected'>");
+  }
+  echo(generate_link($text,$vars,array('view'=>$option)));
+  if ($vars['view'] == $option)
+  {
+    echo("</span>");
+  }
+  $sep = " | ";
+}
+
+unset($sep);
+
+print_optionbar_end();
 
 
 if($vars['view'] == "incoming")
 {
 
-    if(count($files_rev[$device['hostname']]))
+    if(count($smokeping_files['in'][$device['hostname']]))
     {
 
        $graph_array['type']                    = "device_smokeping_in_all";
@@ -38,7 +45,7 @@ if($vars['view'] == "incoming")
 
 } else {
 
-    if(count($files[$device['hostname']]))
+    if(count($smokeping_files['out'][$device['hostname']]))
     {
 
        $graph_array['type']                    = "device_smokeping_out_all";
@@ -50,10 +57,4 @@ if($vars['view'] == "incoming")
 
 }
 
-
-echo("<pre>");
-print_r($files);
-echo("</pre>");
-
-
 ?>