diff --git a/html/css/styles.css b/html/css/styles.css
index 1ce589250..4f5edbecc 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1,3 +1,11 @@
+.pagemenu-selected {
+  font-weight: bold; 
+  background-color: #cecece; 
+  -moz-border-radius: 15px; 
+  border-radius: 15px; 
+  padding: 2px 8px 3px 8px;
+}
+
 .submit {
   background-image:url('/images/submitbg.png');
   background-position:0 100%;
diff --git a/html/images/icons/fanspeeds.png b/html/images/icons/fanspeed.png
similarity index 100%
rename from html/images/icons/fanspeeds.png
rename to html/images/icons/fanspeed.png
diff --git a/html/images/icons/frequencies.png b/html/images/icons/frequency.png
similarity index 100%
rename from html/images/icons/frequencies.png
rename to html/images/icons/frequency.png
diff --git a/html/images/icons/greyscale/fanspeeds.png b/html/images/icons/greyscale/fanspeed.png
similarity index 100%
rename from html/images/icons/greyscale/fanspeeds.png
rename to html/images/icons/greyscale/fanspeed.png
diff --git a/html/images/icons/greyscale/frequencies.png b/html/images/icons/greyscale/frequency.png
similarity index 100%
rename from html/images/icons/greyscale/frequencies.png
rename to html/images/icons/greyscale/frequency.png
diff --git a/html/images/icons/greyscale/processors.png b/html/images/icons/greyscale/processor.png
similarity index 100%
rename from html/images/icons/greyscale/processors.png
rename to html/images/icons/greyscale/processor.png
diff --git a/html/images/icons/greyscale/temperatures.png b/html/images/icons/greyscale/temperature.png
similarity index 100%
rename from html/images/icons/greyscale/temperatures.png
rename to html/images/icons/greyscale/temperature.png
diff --git a/html/images/icons/greyscale/voltages.png b/html/images/icons/greyscale/voltage.png
similarity index 100%
rename from html/images/icons/greyscale/voltages.png
rename to html/images/icons/greyscale/voltage.png
diff --git a/html/images/icons/processors.png b/html/images/icons/processor.png
similarity index 100%
rename from html/images/icons/processors.png
rename to html/images/icons/processor.png
diff --git a/html/images/icons/temperatures.png b/html/images/icons/temperature.png
similarity index 100%
rename from html/images/icons/temperatures.png
rename to html/images/icons/temperature.png
diff --git a/html/images/icons/voltages.png b/html/images/icons/voltage.png
similarity index 100%
rename from html/images/icons/voltages.png
rename to html/images/icons/voltage.png
diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index 2f9cd6fa0..3868a46cb 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-$datas = array('Processors','Memory','Storage','Temperatures', 'Humidity', 'Fanspeeds', 'Voltages', 'Frequencies', 'Current');
+$datas = array('Processor','Memory','Storage','Temperature', 'Humidity', 'Fanspeed', 'Voltage', 'Frequency', 'Current');
 
 if (!$_GET['opta']) { $_GET['opta'] = "processors"; }
 if (!$_GET['optb']) { $_GET['optb'] = "nographs"; }
@@ -14,15 +14,18 @@ foreach ($datas as $texttype)
   echo($sep);
   if ($_GET['opta'] == $type)
   {
-    echo("<strong>");
-    echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
+    echo("<span class='pagemenu-selected'>"); 
+ #'style='font-weight: bold; background-color: #ffffff; -moz-border-radius: 15px; border-radius: 15px; padding: 2px 8px;'>");
+#    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'].'/health/' . $type . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/"> ' . $texttype ."</a>\n");
-  if ($_GET['opta'] == $type) { echo("</strong>"); }
+  echo('<a href="'.$config['base_url'].'/health/' . $type . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $texttype ."</a>");
+ 
+ if ($_GET['opta'] == $type) { echo("</span>"); }
+
   $sep = ' | ';
 }
 
@@ -32,32 +35,29 @@ echo('<div style="float: right;">');
 
 if ($_GET['optb'] == "graphs")
 {
-  echo('<strong>');
-  echo('<img src="images/icons/graphs.png" class="optionicon" />');
-} else {
-  echo('<img src="images/icons/greyscale/graphs.png" class="optionicon" />');
+  echo('<span class="pagemenu-selected">');
 }
 
 echo('<a href="health/'. $_GET['opta'].'/graphs/"> Graphs</a>');
 
 if ($_GET['optb'] == "graphs")
 {
-  echo('</strong>');
+  echo('</span>');
 }
 
 echo(' | ');
 
 if ($_GET['optb'] == "nographs")
 {
-  echo('<strong>');
-  echo('<img src="images/icons/nographs.png" class="optionicon" />');
-} else {
-  echo('<img src="images/icons/greyscale/nographs.png" class="optionicon" />');
+  echo('<span class="pagemenu-selected">');
 }
 
 echo('<a href="health/'. $_GET['opta'].'/nographs/"> No Graphs</a>');
 
-if ($_GET['optb'] == "nographs") { echo('</strong>'); }
+if ($_GET['optb'] == "nographs") 
+{ 
+  echo('</span>'); 
+}
 
 echo('</div>');
 
@@ -65,20 +65,20 @@ print_optionbar_end();
 
 switch ($_GET['opta'])
 {
-  case 'processors':
+  case 'processor':
   case 'memory':
   case 'storage':
-  case 'temperatures':
+  case 'temperature':
   case 'humidity':
-  case 'voltages':
-  case 'fanspeeds':
-  case 'frequencies':
+  case 'voltage':
+  case 'fanspeed':
+  case 'frequency':
   case 'current':
     include('pages/health/'.$_GET['opta'].'.inc.php');
     break;
   default:
-    include('pages/health/temperatures.inc.php');
+    include('pages/health/temperature.inc.php');
     break;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/health/current.inc.php b/html/pages/health/current.inc.php
index 58cb9777b..92f6faa9e 100644
--- a/html/pages/health/current.inc.php
+++ b/html/pages/health/current.inc.php
@@ -31,18 +31,18 @@ while ($sensor = mysql_fetch_assoc($query))
 {
   if (is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $weekly_sensor = "graph.php?id=" . $sensor['sensor_id'] . "&amp;amp;type=".$graph_type."&amp;amp;from=$week&amp;amp;to=$now&amp;amp;width=500&amp;amp;height=150";
+  $weekly_sensor = "graph.php?id=" . $sensor['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $sensor_popup = "<a href=\"graphs/" . $sensor['sensor_id'] . "/".$graph_type."/\" onmouseover=\"return overlib('<img src=\'$weekly_sensor\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $sensor['sensor_descr'] . "</a>";
 
   if ($sensor['sensor_current'] >= $sensor['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
 
-  $sensor_day    = "graph.php?id=" . $sensor['sensor_id'] . "&amp;amp;type=".$graph_type."&amp;amp;from=$day&amp;amp;to=$now&amp;amp;width=300&amp;amp;height=100";
-  $sensor_week   = "graph.php?id=" . $sensor['sensor_id'] . "&amp;amp;type=".$graph_type."&amp;amp;from=$week&amp;amp;to=$now&amp;amp;width=300&amp;amp;height=100";
-  $sensor_month  = "graph.php?id=" . $sensor['sensor_id'] . "&amp;amp;type=".$graph_type."&amp;amp;from=$month&amp;amp;to=$now&amp;amp;width=300&amp;amp;height=100";
-  $sensor_year   = "graph.php?id=" . $sensor['sensor_id'] . "&amp;amp;type=".$graph_type."&amp;amp;from=$year&amp;amp;to=$now&amp;amp;width=300&amp;amp;height=100";
+  $sensor_day    = "graph.php?id=" . $sensor['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=300&amp;height=100";
+  $sensor_week   = "graph.php?id=" . $sensor['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$week&amp;to=$now&amp;width=300&amp;height=100";
+  $sensor_month  = "graph.php?id=" . $sensor['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=300&amp;height=100";
+  $sensor_year   = "graph.php?id=" . $sensor['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$year&amp;to=$now&amp;width=300&amp;height=100";
 
-  $sensor_minigraph = "<img src='graph.php?id=" . $sensor['sensor_id'] . "&amp;amp;type=".$graph_type."&amp;amp;from=$day&amp;amp;to=$now&amp;amp;width=100&amp;amp;height=20'";
+  $sensor_minigraph = "<img src='graph.php?id=" . $sensor['sensor_id'] . "&amp;type=".$graph_type."&amp;from=$day&amp;to=$now&amp;width=100&amp;height=20'";
   $sensor_minigraph .= " onmouseover=\"return overlib('<div class=list-large>".$sensor['hostname']." - ".$sensor['sensor_descr'];
   $sensor_minigraph .= "</div><div style=\'width: 750px\'><img src=\'$sensor_day\'><img src=\'$sensor_week\'><img src=\'$sensor_month\'><img src=\'$sensor_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
 
@@ -90,4 +90,4 @@ while ($sensor = mysql_fetch_assoc($query))
 
 echo("</table>");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/health/fanspeeds.inc.php b/html/pages/health/fanspeed.inc.php
similarity index 100%
rename from html/pages/health/fanspeeds.inc.php
rename to html/pages/health/fanspeed.inc.php
diff --git a/html/pages/health/frequencies.inc.php b/html/pages/health/frequency.inc.php
similarity index 100%
rename from html/pages/health/frequencies.inc.php
rename to html/pages/health/frequency.inc.php
diff --git a/html/pages/health/processors.inc.php b/html/pages/health/processor.inc.php
similarity index 100%
rename from html/pages/health/processors.inc.php
rename to html/pages/health/processor.inc.php
diff --git a/html/pages/health/temperatures.inc.php b/html/pages/health/temperature.inc.php
similarity index 100%
rename from html/pages/health/temperatures.inc.php
rename to html/pages/health/temperature.inc.php
diff --git a/html/pages/health/voltages.inc.php b/html/pages/health/voltage.inc.php
similarity index 100%
rename from html/pages/health/voltages.inc.php
rename to html/pages/health/voltage.inc.php