diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 329a9d2959..27cb18dbcf 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -153,7 +153,18 @@ echo('<li><a href="interfaces/?status=0"><img src="images/16/link_error.png" bor
 </ul></td></tr></table>
 </li>
 
-<li><a class="menu2four" href="/temperatures/"><img src="images/16/weather_sun.png" border="0" align="absmiddle" /> Temps</a></li>
+<ul>
+<li><a class="menu2four" href="sensors/temperatures/"><img src="images/16/contrast.png" border="0" align="absmiddle" /> Sensors</a>
+        <table><tr><td>
+        <ul>
+        <li><a href="sensors/temperatures/"><img src="images/16/weather_sun.png" border="0" align="absmiddle" /> Temperatures</a></li>
+        <li><a href="sensors/fans/"><img src="images/16/chart_curve.png" border="0" align="absmiddle" /> Fans</a></li>
+        <li><a href="sensors/voltages/"><img src="images/16/chart_bar.png" border="0" align="absmiddle" /> Voltages</a></li>
+        </ul>
+        </td></tr></table>
+
+</li>
+</ul>
 
 <li><a class="menu2four" href="/storage/"><img src="images/16/database.png" border="0" align="absmiddle" /> Storage</a></li>
 
diff --git a/html/pages/sensors.php b/html/pages/sensors.php
new file mode 100644
index 0000000000..350fd9bc8e
--- /dev/null
+++ b/html/pages/sensors.php
@@ -0,0 +1,15 @@
+<?php
+
+switch ($_GET['opta'])
+{
+  case 'temperatures':
+  case 'voltages':
+  case 'fans':
+    include('pages/sensors/'.$_GET['opta'].'.php');
+    break;
+  default:
+    include('pages/sensors/temperatures.php');
+    break;
+}
+
+?>
\ No newline at end of file
diff --git a/html/pages/temperatures.php b/html/pages/sensors/temperatures.php
similarity index 95%
rename from html/pages/temperatures.php
rename to html/pages/sensors/temperatures.php
index 960a332da1..2d6b6ca5e3 100644
--- a/html/pages/temperatures.php
+++ b/html/pages/sensors/temperatures.php
@@ -26,9 +26,6 @@ while($temp = mysql_fetch_array($query))
 {
   if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
-  $speed = humanspeed($temp['ifSpeed']);
-  $type = humanmedia($temp['ifType']);
-
   $weekly_temp  = "graph.php?id=" . $temp['temp_id'] . "&amp;type=temperature&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
   $temp_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $temp['temp_descr'] . "</a>";
@@ -54,7 +51,7 @@ while($temp = mysql_fetch_array($query))
 	  <td width=100>$alert</td>
           <td style='color: $temp_colour; text-align: center; font-weight: bold;'>" . $temp['temp_current'] . " &deg;C</td>
           <td style='text-align: center'>" . $temp['temp_limit'] . " &deg;C</td>
-          <td>" . $temp['temp_notes'] . "</td>
+          <td>" . (isset($temp['temp_notes']) ? $temp['temp_notes'] : '') . "</td>
         </tr>\n");
 
   $row++;