diff --git a/build/portal/html/templates/default/assets/js/graphs.js b/build/portal/html/templates/default/assets/js/graphs.js
index 0351377..743ac2b 100644
--- a/build/portal/html/templates/default/assets/js/graphs.js
+++ b/build/portal/html/templates/default/assets/js/graphs.js
@@ -49,22 +49,22 @@ function switchView(newTimeFrame) {
     $("#dump1090-tracks-image").attr("src", "graphs/dump1090-" + $hostName + "-tracks-" + $timeFrame + ".png?time=" + $timestamp);
     $("#dump1090-tracks-link").attr("href", "graphs/dump1090-" + $hostName + "-tracks-" + $timeFrame + ".png?time=" + $timestamp);
 
-    element =  document.getElementById('dump1090-range-imperial-nautical-image');
+    element =  document.getElementById('dump1090-range_imperial_nautical-image');
     if (typeof(element) != 'undefined' && element != null) {
-        $("#dump1090-range-imperial-image").attr("src", "graphs/dump1090-" + $hostName + "-range-imperial-nautical-" + $timeFrame + ".png?time=" + $timestamp);
-        $("#dump1090-range-imperial-link").attr("href", "graphs/dump1090-" + $hostName + "-range-imperial-nautical-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#dump1090-range_imperial_nautical-image").attr("src", "graphs/dump1090-" + $hostName + "-range_imperial_nautical-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#dump1090-range_imperial_nautical-link").attr("href", "graphs/dump1090-" + $hostName + "-range_imperial_nautical-" + $timeFrame + ".png?time=" + $timestamp);
     }
 
-    element =  document.getElementById('dump1090-range-imperial-statute-image');
+    element =  document.getElementById('dump1090-range_imperial_statute-image');
     if (typeof(element) != 'undefined' && element != null) {
-        $("#dump1090-range-imperial-image").attr("src", "graphs/dump1090-" + $hostName + "-range-imperial-statute-" + $timeFrame + ".png?time=" + $timestamp);
-        $("#dump1090-range-imperial-link").attr("href", "graphs/dump1090-" + $hostName + "-range-imperial-statute-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#dump1090-range_imperial_statute-image").attr("src", "graphs/dump1090-" + $hostName + "-range_imperial_statute-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#dump1090-range_imperial_statute-link").attr("href", "graphs/dump1090-" + $hostName + "-range_imperial_statute-" + $timeFrame + ".png?time=" + $timestamp);
     }
 
-    element =  document.getElementById('dump1090-range-metric-image');
+    element =  document.getElementById('dump1090-range_metric-image');
     if (typeof(element) != 'undefined' && element != null) {
-        $("#dump1090-range-metric-image").attr("src", "graphs/dump1090-" + $hostName + "-range-metric-" + $timeFrame + ".png?time=" + $timestamp);
-        $("#dump1090-range-metric-link").attr("href", "graphs/dump1090-" + $hostName + "-range-metric-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#dump1090-range_metric-image").attr("src", "graphs/dump1090-" + $hostName + "-range_metric-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#dump1090-range_metric-link").attr("href", "graphs/dump1090-" + $hostName + "-range_metric-" + $timeFrame + ".png?time=" + $timestamp);
     }
 
     $("#dump1090-signal-image").attr("src", "graphs/dump1090-" + $hostName + "-signal-" + $timeFrame + ".png?time=" + $timestamp);
@@ -90,15 +90,15 @@ function switchView(newTimeFrame) {
     $("#system-memory-image").attr("src", "graphs/system-" + $hostName + "-memory-" + $timeFrame + ".png?time=" + $timestamp);
     $("#system-memory-link").attr("href", "graphs/system-" + $hostName + "-memory-" + $timeFrame + ".png?time=" + $timestamp);
 
-    element =  document.getElementById('system-temperature-imperial-image');
+    element =  document.getElementById('system-temperature_imperial-image');
     if (typeof(element) != 'undefined' && element != null) {
-        $("#system-temperature-imperial-image").attr("src", "graphs/system-" + $hostName + "-temperature-imperial-" + $timeFrame + ".png?time=" + $timestamp);
-        $("#system-temperature-imperial-link").attr("href", "graphs/system-" + $hostName + "-temperature-imperial-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#system-temperature_imperial-image").attr("src", "graphs/system-" + $hostName + "-temperature_imperial-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#system-temperature_imperial-link").attr("href", "graphs/system-" + $hostName + "-temperature_imperial-" + $timeFrame + ".png?time=" + $timestamp);
     }
-    element =  document.getElementById('system-temperature-metric-image');
+    element =  document.getElementById('system-temperature_metric-image');
     if (typeof(element) != 'undefined' && element != null) {
-        $("#system-temperature-metric-image").attr("src", "graphs/system-" + $hostName + "-temperature-metric-" + $timeFrame + ".png?time=" + $timestamp);
-        $("#system-temperature-metric-link").attr("href", "graphs/system-" + $hostName + "-temperature-metric-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#system-temperature_metric-image").attr("src", "graphs/system-" + $hostName + "-temperature_metric-" + $timeFrame + ".png?time=" + $timestamp);
+        $("#system-temperature_metric-link").attr("href", "graphs/system-" + $hostName + "-temperature_metric-" + $timeFrame + ".png?time=" + $timestamp);
     }
 
     $("#system-df_root-image").attr("src", "graphs/system-" + $hostName + "-df_root-" + $timeFrame + ".png?time=" + $timestamp);
diff --git a/build/portal/html/templates/default/graphs.tpl b/build/portal/html/templates/default/graphs.tpl
index 01925c4..9d527fb 100644
--- a/build/portal/html/templates/default/graphs.tpl
+++ b/build/portal/html/templates/default/graphs.tpl
@@ -61,22 +61,22 @@
                         <div class="row">
                             {if setting:measurementRange eq imperialNautical}
                             <div class="col-md-6 text-center">
-                                <a id ="dump1090-range-imperial-nautical-link" href="#">
-                                    <img id="dump1090-range-imperial-nautical-image" class="img-responsive" src="#" alt="Max Range (Nautical Miles)">
+                                <a id ="dump1090-range_imperial_nautical-link" href="#">
+                                    <img id="dump1090-range_imperial_nautical-image" class="img-responsive" src="#" alt="Max Range (Nautical Miles)">
                                 </a>
                             </div>
                             {/if}
                             {if setting:measurementRange eq imperialStatute}
                             <div class="col-md-6 text-center">
-                                <a id ="dump1090-range-imperial-statute-link" href="#">
-                                    <img id="dump1090-range-imperial-statute-image" class="img-responsive" src="#" alt="Max Range (Statute Miles)">
+                                <a id ="dump1090-range_imperial_statute-link" href="#">
+                                    <img id="dump1090-range_imperial_statute-image" class="img-responsive" src="#" alt="Max Range (Statute Miles)">
                                 </a>
                             </div>
                             {/if}
                             {if setting:measurementRange eq metric}
                             <div class="col-md-6 text-center">
-                                <a id ="dump1090-range-metric-link" href="#">
-                                    <img id="dump1090-range-metric-image" class="img-responsive" src="#" alt="Max Range (Kilometers)">
+                                <a id ="dump1090-range_metric-link" href="#">
+                                    <img id="dump1090-range_metric-image" class="img-responsive" src="#" alt="Max Range (Kilometers)">
                                 </a>
                             </div>
                             {/if}
@@ -123,11 +123,20 @@
                         </div>
                         <div class="padding"></div>
                         <div class="row">
+                            {if setting:measurementTemperature eq imperial}
                             <div class="col-md-6 text-center">
-                                <a id ="system-temperature-link" href="#">
-                                   <img id="system-temperature-image" class="img-responsive" src="#" alt="Core Temperature">
+                                <a id ="system-temperature_imperial-link" href="#">
+                                   <img id="system-temperature_imperial-image" class="img-responsive" src="#" alt="Core Temperature">
                                 </a>
                             </div>
+                            {/if}
+                            {if setting:measurementTemperature eq metric}
+                            <div class="col-md-6 text-center">
+                                <a id ="system-temperature_metric-link" href="#">
+                                   <img id="system-temperature_metric-image" class="img-responsive" src="#" alt="Core Temperature">
+                                </a>
+                            </div>
+                            {/if}
                             <div class="col-md-6 text-center">
                                 <a id ="system-memory-link" href="#">
                                    <img id="system-memory-image" class="img-responsive" src="#" alt="Memory Utilization">