diff --git a/html/pages/device/health/diskio.inc.php b/html/pages/device/health/diskio.inc.php
index c1397237f5..4201929e5b 100644
--- a/html/pages/device/health/diskio.inc.php
+++ b/html/pages/device/health/diskio.inc.php
@@ -18,7 +18,7 @@ while($drive = mysql_fetch_array($query)) {
 
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-    $fs_url   = "/device/".$device['device_id']."/health/diskio/";
+    $fs_url   = "device/".$device['device_id']."/health/diskio/";
 
     $fs_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['diskio_descr'];
     $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['diskio_id'] . "&type=diskio_ops&from=$month&to=$now&width=400&height=125\'>";
diff --git a/html/pages/device/health/memory.inc.php b/html/pages/device/health/memory.inc.php
index 37cf668ed7..7bb58e79bd 100644
--- a/html/pages/device/health/memory.inc.php
+++ b/html/pages/device/health/memory.inc.php
@@ -9,12 +9,10 @@ $graph_type = "mempool_usage";
   while($mempool = mysql_fetch_array($mempools)) {
     if(!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
  
-    $proc_url   = "?page=device/".$device['device_id']."/health/memory/";
- 
     $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
 
-    $mempool_url   = "/device/".$device['device_id']."/health/memory/";
-    $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+    $mempool_url   = "device/".$device['device_id']."/health/memory/";
+    $mini_url = "graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
     $mempool_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
     $mempool_popup .= "</div><img src=\'graph.php?id=" . $mempool['mempool_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";
diff --git a/html/pages/device/health/processors.inc.php b/html/pages/device/health/processors.inc.php
index 01075d9bed..fa8f51978e 100644
--- a/html/pages/device/health/processors.inc.php
+++ b/html/pages/device/health/processors.inc.php
@@ -8,9 +8,9 @@ $i = '1';
 $procs = mysql_query("SELECT * FROM `processors` WHERE device_id = '" . $device['device_id'] . "'");
 while($proc = mysql_fetch_array($procs)) {
 
-  $proc_url   = $config['base_url']."/device/".$device['device_id']."/health/processors/";
+  $proc_url   = "device/".$device['device_id']."/health/processors/";
 
-  $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
+  $mini_url = "graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
 
   $text_descr = $proc['processor_descr'];
 
diff --git a/html/pages/device/health/storage.inc.php b/html/pages/device/health/storage.inc.php
index d5a1e25f20..33c3957b8b 100644
--- a/html/pages/device/health/storage.inc.php
+++ b/html/pages/device/health/storage.inc.php
@@ -28,7 +28,7 @@ while($drive = mysql_fetch_array($query)) {
     $total = formatStorage($total);
     $free = formatStorage($free);
 
-    $fs_url   = "?page=device&id=".$device['device_id']."&section=dev-storage";
+    $fs_url   = "device/".$device['device_id']."/health/storage/";
 
     $fs_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$drive['storage_descr'];
     $fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&type=".$graph_type."&from=$month&to=$now&width=400&height=125\'>";