diff --git a/html/pages/device/health/diskio.inc.php b/html/pages/device/health/diskio.inc.php
index 0fac6fbbd..bb9623e79 100644
--- a/html/pages/device/health/diskio.inc.php
+++ b/html/pages/device/health/diskio.inc.php
@@ -15,7 +15,7 @@ foreach (dbFetchRows("SELECT * FROM `ucd_diskio` WHERE device_id = ? ORDER BY di
 {
   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['device_id']."/tab=health/metric=diskio/";
 
   $graph_array_zoom['id']     = $drive['diskio_id'];
   $graph_array_zoom['type']   = "diskio_ops";
diff --git a/html/pages/device/health/processor.inc.php b/html/pages/device/health/processor.inc.php
index 549413044..0e54b9264 100644
--- a/html/pages/device/health/processor.inc.php
+++ b/html/pages/device/health/processor.inc.php
@@ -8,7 +8,7 @@ echo("<table width=100% cellpadding=6 cellspacing=0>");
 $i = '1';
 foreach (dbFetchRows("SELECT * FROM `processors` WHERE device_id = ?", array($device['device_id'])) as $proc)
 {
-  $proc_url   = "device/".$device['device_id']."/health/processor/";
+  $proc_url   = "device/device=".$device['device_id']."/tab=health/metric=processor/";
 
   $mini_url = "graph.php?id=".$proc['processor_id']."&amp;type=".$graph_type."&amp;from=".$day."&amp;to=".$now."&amp;width=80&amp;height=20&amp;bg=f4f4f4";
 
diff --git a/html/pages/device/health/storage.inc.php b/html/pages/device/health/storage.inc.php
index be1f4f404..e0ab4eed0 100644
--- a/html/pages/device/health/storage.inc.php
+++ b/html/pages/device/health/storage.inc.php
@@ -25,7 +25,7 @@ foreach (dbFetchRows("SELECT * FROM `storage` WHERE device_id = ? ORDER BY stora
   $total = formatStorage($total);
   $free = formatStorage($free);
 
-  $fs_url   = "device/".$device['device_id']."/health/storage/";
+  $fs_url   = "device/device=".$device['device_id']."/tab=health/metric=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'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=400&amp;height=125\'>";
diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php
index bc5f2c882..bb0e54d05 100644
--- a/html/pages/device/overview.inc.php
+++ b/html/pages/device/overview.inc.php
@@ -89,7 +89,7 @@ include("overview/sensors/frequencies.inc.php");
 
 echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
 echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
-echo('<a class="sectionhead" href="device/'.$device['device_id'].'/events/">');
+echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=events/">');
 echo("<img align='absmiddle' src='images/16/report.png'> Recent Events</a></p>");
 
 echo("<table cellspacing=0 cellpadding=2 width=100%>");
diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php
index 8f90eaf0e..d24197f60 100644
--- a/html/pages/device/overview/generic/sensor.inc.php
+++ b/html/pages/device/overview/generic/sensor.inc.php
@@ -5,7 +5,7 @@ $sensors = dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND dev
 if (count($sensors))
 {
   echo('<div style="background-color: #eeeeee; margin: 5px; padding: 5px;">');
-  echo('<p style="padding: 0px 5px 5px;" class="sectionhead"><a class="sectionhead" href="device/'.$device['device_id'].'/health/' . strtolower($sensor_type) . '/"><img align="absmiddle" src="'.$config['base_url'].'/images/icons/' . strtolower($sensor_type) . '.png"> ' . $sensor_type . '</a></p>');
+  echo('<p style="padding: 0px 5px 5px;" class="sectionhead"><a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=' . strtolower($sensor_type) . '/"><img align="absmiddle" src="'.$config['base_url'].'/images/icons/' . strtolower($sensor_type) . '.png"> ' . $sensor_type . '</a></p>');
   $i = '1';
   echo('<table width="100%" valign="top">');
   foreach ($sensors as $sensor)
diff --git a/html/pages/device/overview/mempools.inc.php b/html/pages/device/overview/mempools.inc.php
index 86afa094a..2e9bec10b 100644
--- a/html/pages/device/overview/mempools.inc.php
+++ b/html/pages/device/overview/mempools.inc.php
@@ -8,7 +8,7 @@ if (count($mempools))
 {
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
-  echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/mempool/">');
+  echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=mempool/">');
   echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/memory.png'> Memory Pools</a></p>");
   echo("<table width=100% cellspacing=0 cellpadding=5>");
   $mempool_rows = '0';
diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php
index d92416b5e..3953904fb 100644
--- a/html/pages/device/overview/processors.inc.php
+++ b/html/pages/device/overview/processors.inc.php
@@ -9,7 +9,7 @@ if (count($processors))
   $processor_rows = 0;
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
-  echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/processor/">');
+  echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=processor/">');
   echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/processor.png'> Processors</a></p>");
   echo("<table width=100% cellspacing=0 cellpadding=5>");
 
diff --git a/html/pages/device/overview/storage.inc.php b/html/pages/device/overview/storage.inc.php
index d67378281..fe4ca0fe3 100644
--- a/html/pages/device/overview/storage.inc.php
+++ b/html/pages/device/overview/storage.inc.php
@@ -8,7 +8,7 @@ if (count($drives))
 {
   echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
   echo("<p style='padding: 0px 5px 5px;' class=sectionhead>");
-  echo('<a class="sectionhead" href="device/'.$device['device_id'].'/health/storage/">');
+  echo('<a class="sectionhead" href="device/device='.$device['device_id'].'/tab=health/metric=storage/">');
   echo("<img align='absmiddle' src='".$config['base_url']."/images/icons/storage.png'> Storage</a></p>");
   echo("<table width=100% cellspacing=0 cellpadding=5>");
   $drive_rows = '0';
diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php
index 4f8865517..70260d80d 100644
--- a/html/pages/device/showconfig.inc.php
+++ b/html/pages/device/showconfig.inc.php
@@ -2,6 +2,8 @@
 
 include("includes/geshi/geshi.php");
 
+# FIXME svn stuff still using optc etc, won't work, needs updating!
+
 if ($_SESSION['userlevel'] >= "7")
 {
 
@@ -21,10 +23,10 @@ if ($_SESSION['userlevel'] >= "7")
 
   if (!$_GET['optc']) {
     echo('<span class="pagemenu-selected">');
-    echo("<a href='device/".$device['device_id']."/showconfig/'> Latest</a>");
+    echo("<a href='device/device=".$device['device_id']."/showconfig/'> Latest</a>");
     echo("</span>");
   } else {
-    echo("<a href='device/".$device['device_id']."/showconfig/'> Latest</a>");
+    echo("<a href='device/device=".$device['device_id']."/showconfig/'> Latest</a>");
   }
 
   if (function_exists('svn_log')) {
@@ -40,7 +42,7 @@ if ($_SESSION['userlevel'] >= "7")
 
       if ($_GET['optc'] == $svnlog["rev"]) { echo('<span class="pagemenu-selected">'); }
 
-      echo("<a href='device/".$device['device_id']."/showconfig/" . $svnlog["rev"] .  "/'> r" . $svnlog["rev"] ." <small>". date("d M H:i", strtotime($svnlog["date"])) . "</small></a>");
+      echo("<a href='device/device=".$device['device_id']."/showconfig/" . $svnlog["rev"] .  "/'> r" . $svnlog["rev"] ." <small>". date("d M H:i", strtotime($svnlog["date"])) . "</small></a>");
       if ($_GET['optc'] == $svnlog["rev"]) { echo("</span>");  }
 
       $sep = " | ";