diff --git a/config.php.default b/config.php.default
index 76581ebfb0..c773cbc681 100755
--- a/config.php.default
+++ b/config.php.default
@@ -1,5 +1,8 @@
 <?php
 
+## Have a look in defaults.php for examples of settinsg you can set here. DO NOT defaults.php!
+include("includes/defaults.php");
+
 ### Database config
 $config['db_host'] = "localhost";
 $config['db_user'] = "USERNAME";
@@ -39,15 +42,6 @@ $config['snmpget']      = "/usr/bin/snmpget";
 $config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk";
 $config['snmpset']      = "/usr/bin/snmpset";
 
-
-### RRDGraph Settings
-
-# Set the general colours and other settings for rrdtool graphs
-
-$config['rrdgraph_def_text']  =  " -c BACK#EEEEEE00 -c SHADEA#EEEEEE00 -c SHADEB#EEEEEE00 -c FONT#000000 -c CANVAS#FFFFFF -c GRID#a5a5a5";
-$config['rrdgraph_def_text'] .= " -c MGRID#FF9999 -c FRAME#5e5e5e -c ARROW#5e5e5e -R normal";
-$config['overlib_defaults']   = ",FGCOLOR,'#ffffff', BGCOLOR, '#e5e5e5', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#555555'";
-
 ### List of networks to allow scanning-based discovery
 $config['nets'] =  array ("89.21.224.0/19", "212.9.12.0/24", "212.9.13.0/24");
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
new file mode 100644
index 0000000000..de00e08225
--- /dev/null
+++ b/includes/defaults.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+$config['rrdgraph_def_text']  =  " -c BACK#EEEEEE00 -c SHADEA#EEEEEE00 -c SHADEB#EEEEEE00 -c FONT#000000 -c CANVAS#FFFFFF -c GRID#a5a5a5";
+$config['rrdgraph_def_text'] .= " -c MGRID#FF9999 -c FRAME#5e5e5e -c ARROW#5e5e5e -R normal";
+$config['overlib_defaults']   = ",FGCOLOR,'#ffffff', BGCOLOR, '#e5e5e5', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#555555', TEXTCOLOR, '#3e3e3e'";
+
+?>
diff --git a/includes/functions.php b/includes/functions.php
index 661114ddc3..51665344e4 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -311,27 +311,33 @@ function geteventicon ($message)
   if ($icon) { return $icon; } else { return false; }
 }
 
-function generateiflink($interface, $text=0, $type = '') 
+function generateiflink($interface, $text=0, $type = NULL) 
 {
   global $twoday; global $now; global $config; global $day; global $month;
   $interface = ifNameDescr($interface);
   if (!$text) { $text = fixIfName($interface['label']); }
-  if (isset($type)) { $interface['graph_type'] = $type; }
-  if (!$interface['graph_type']) { $interface['graph_type'] = 'port_bits'; }
+  if (isset($type)) { $interface['graph_type'] = $type; } else { $interface['graph_type'] = 'port_bits'; }
   $class = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']);
   $graph_url = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&amp;from=$day&amp;to=$now&amp;width=400&amp;height=100&amp;type=" . $interface['graph_type'];
   $graph_url_month = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&amp;from=$month&amp;to=$now&amp;width=400&amp;height=100&amp;type=" . $interface['graph_type'];
   $device_id = getifhost($interface['interface_id']);
-  $link = "<a class=$class href='".$config['base_url']."/device/$device_id/interface/" . $interface['interface_id'] . "/' ";
-  $link .= "onmouseover=\" return overlib('";
-  $link .= "<img src=\'$graph_url\'><br /><img src=\'$graph_url_month\'>', CAPTION, '<span class=list-large>" . $interface['hostname'] . " - " . fixifName($interface['label']) . "</span>";
-  if ($interface['ifAlias']) { $link .= "<br />" . htmlentities($interface['ifAlias']); }
-  $link .= "' ";
-  $link .= $config['overlib_defaults'].");\" onmouseout=\"return nd();\" >$text</a>";
+  $url = $config['base_url']."/device/$device_id/interface/" . $interface['interface_id'] . "/";
 
+  $contents = "<div class=list-large>" . $interface['hostname'] . " - " . fixifName($interface['label']) . "</div>";
+  if ($interface['ifAlias']) { $contents .= htmlentities($interface['ifAlias'] ."<br />" ); }
+  $contents .= "<img src=\'$graph_url\'><br /><img src=\'$graph_url_month\'>";
+  $link = overlib_link($url, $text, $contents, $class);
   return $link;
 }
 
+function overlib_link($url, $text, $contents, $class) {
+  global $config;
+  $output = "<a class='".$class."' href='".$url."'";
+  $output .= " onmouseover=\"return overlib('".$contents."'".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">";
+  $output .= $text."</a>";
+  return $output;
+}
+
 function generatedevicelink($device, $text=0, $start=0, $end=0) 
 {
   global $twoday; global $day; global $now; global $config;
@@ -341,9 +347,13 @@ function generatedevicelink($device, $text=0, $start=0, $end=0)
   if (!$text) { $text = $device['hostname']; }
   $graph_url = $config['base_url'] . "/graph.php?device=" . $device['device_id'] . "&amp;from=$start&amp;to=$end&amp;width=400&amp;height=120&amp;type=device_cpu";
   $graph_url_b = $config['base_url'] . "/graph.php?device=" . $device['device_id'] . "&amp;from=$start&amp;to=$end&amp;width=400&amp;height=120&amp;type=device_memory";
-  $link  = "<a class=$class href='".$config['base_url']."/device/" . $device['device_id'] . "/' ";
-  $link .= "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - CPU &amp; Memory Usage</div>";
-  $link .= "<img src=\'$graph_url\'><br /><img src=\'$graph_url_b\'>'".$config['overlib_defaults'].", LEFT);\" onmouseout=\"return nd();\">" . htmlentities($text) . "</a>";
+
+  $url  = $config['base_url']."/device/" . $device['device_id'] . "/";
+  $contents = "<div class=list-large>".$device['hostname']." - CPU &amp; Memory Usage</div>";
+  if ($device['location']) { $contents .= "" . htmlentities($device['location']."<br />"); }
+  $contents .= "<img src=\'$graph_url\'><br /><img src=\'$graph_url_b\'";
+  $text = htmlentities($text);
+  $link = overlib_link($url, $text, $contents, $class);
   return $link;
 }