diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php
index 878d96474a..36fc203e21 100644
--- a/html/pages/bill.inc.php
+++ b/html/pages/bill.inc.php
@@ -69,21 +69,21 @@ if (bill_permitted($bill_id))
 
   if (!$_GET['optb']) { $_GET['optb'] = "details"; }
 
-  if ($_GET['optb'] == "details") { echo("<strong>"); }
+  if ($_GET['optb'] == "details") { echo("<span class='pagemenu-selected'>"); }
   echo("<a href='bill/".$bill_id."/details/'>Details</a>");
-  if ($_GET['optb'] == "details") { echo("</strong>"); }
+  if ($_GET['optb'] == "details") { echo("</span>"); }
 
   if ($_SESSION['userlevel'] == "10")
   {
     echo(" | ");
-    if ($_GET['optb'] == "edit") { echo("<strong>"); }
+    if ($_GET['optb'] == "edit") { echo("<span class='pagemenu-selected'>"); }
     echo("<a href='bill/".$bill_id."/edit/'>Edit</a>");
-    if ($_GET['optb'] == "edit") { echo("</strong>"); }
+    if ($_GET['optb'] == "edit") { echo("</span>"); }
 
     echo(" | ");
-    if ($_GET['optb'] == "delete") { echo("<strong>"); }
+    if ($_GET['optb'] == "delete") { echo("<span class='pagemenu-selected'>"); }
     echo("<a href='bill/".$bill_id."/delete/'>Delete</a>");
-    if ($_GET['optb'] == "delete") { echo("</strong>"); }
+    if ($_GET['optb'] == "delete") { echo("</span>"); }
   }
 
   print_optionbar_end();
diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index 64c918b6f3..d73ed48c61 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -27,14 +27,14 @@ if ($_SESSION['userlevel'] < '7')
     echo($sep);
     if ($_GET['opta'] == $type)
     {
-      echo("<strong>");
-      echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
+      echo("<span class='pagemenu-selected'>");
+      #echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
     } else {
-      echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
+      #echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
     }
 
-    echo("<a href='".$config['base_url']."/device/".$device['device_id']."/edit/" . $type . ($_GET['optb'] ? "/" . $_GET['optb'] : ''). "/'> " . $text ."</a>\n");
-    if ($_GET['opta'] == $type) { echo("</strong>"); }
+    echo("<a href='".$config['base_url']."/device/".$device['device_id']."/edit/" . $type . ($_GET['optb'] ? "/" . $_GET['optb'] : ''). "/'> " . $text ."</a>");
+    if ($_GET['opta'] == $type) { echo("</span>"); }
     $sep = " | ";
   }
 
@@ -46,4 +46,4 @@ if ($_SESSION['userlevel'] < '7')
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index e0707084d5..873f9ec4a9 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -14,7 +14,7 @@ $type_text['fanspeed'] = "Fanspeed";
 $type_text['frequency'] = "Frequency";
 $type_text['current'] = "Current";
 
-if (!$_GET['opta']) { $_GET['opta'] = "processors"; }
+if (!$_GET['opta']) { $_GET['opta'] = "processor"; }
 if (!$_GET['optb']) { $_GET['optb'] = "nographs"; }
 
 print_optionbar_start('', '');
diff --git a/includes/static-config.php b/includes/static-config.php
index 75ee951f40..48329050bd 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -551,14 +551,14 @@ $config['os'][$os]['over'][0]['text']   = "Current";
 $os = "akcp";
 $config['os'][$os]['text']              = "AKCP SensorProbe";
 $config['os'][$os]['type']              = "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
-$config['os'][$os]['over'][0]['text']   = "Temperatures";
+$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['text']   = "temperature";
 
 $os = "minkelsrms";
 $config['os'][$os]['text']        	= "Minkels RMS";
 $config['os'][$os]['type']        	= "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
-$config['os'][$os]['over'][0]['text']   = "Temperatures";
+$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['text']   = "temperature";
 
 $os = "ipoman";
 $config['os'][$os]['text']              = "Ingrasys iPoMan";
@@ -570,21 +570,21 @@ $config['os'][$os]['over'][0]['text']   = "Current";
 $os = "wxgoos";
 $config['os'][$os]['text']              = "ITWatchDogs Goose";
 $config['os'][$os]['type']              = "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
-$config['os'][$os]['over'][0]['text']   = "Temperatures";
+$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['text']   = "temperature";
 
 $os = "papouch-tme";
 $config['os'][$os]['text']       	= "Papouch TME";
 $config['os'][$os]['type']       	= "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
-$config['os'][$os]['over'][0]['text']   = "Temperatures";
+$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['text']   = "temperature";
 
 $os = "cometsystem-p85xx";
 $config['os'][$os]['text']       	= "Comet System P85xx";
 $config['os'][$os]['type']       	= "environment";
 $config['os'][$os]['icon']        	= "comet";
-$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
-$config['os'][$os]['over'][0]['text']   = "Temperatures";
+$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['text']   = "temperature";
 
 $os = "dell-laser";
 $config['os'][$os]['group'] 	   	= "printer";
@@ -782,9 +782,9 @@ $config['graph_types']['device']['processor']['descr'] = 'Processor Usage';
 $config['graph_types']['device']['storage']['section'] = 'system';
 $config['graph_types']['device']['storage']['order'] = '0';
 $config['graph_types']['device']['storage']['descr'] = 'Filesystem Usage';
-$config['graph_types']['device']['temperatures']['section'] = 'system';
-$config['graph_types']['device']['temperatures']['order'] = '0';
-$config['graph_types']['device']['temperatures']['descr'] = 'Temperatures';
+$config['graph_types']['device']['temperature']['section'] = 'system';
+$config['graph_types']['device']['temperature']['order'] = '0';
+$config['graph_types']['device']['temperature']['descr'] = 'temperature';
 $config['graph_types']['device']['ucd_cpu']['section'] = 'system';
 $config['graph_types']['device']['ucd_cpu']['order'] = '0';
 $config['graph_types']['device']['ucd_cpu']['descr'] = 'Detailed Processor Usage';