diff --git a/js/component/card/runtime_sensor_detail.js b/js/component/card/runtime_sensor_detail.js
index cf04bf7..2825ca3 100644
--- a/js/component/card/runtime_sensor_detail.js
+++ b/js/component/card/runtime_sensor_detail.js
@@ -251,54 +251,53 @@ beestat.component.card.runtime_sensor_detail.prototype.decorate_top_right_ = fun
 
   var menu = (new beestat.component.menu()).render(parent);
 
-  if (this.has_data_() === true) {
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Past 1 Day')
-      .set_icon('numeric_1_box')
-      .set_callback(function() {
-        if (
-          beestat.setting('runtime_sensor_detail_range_dynamic') !== 1 ||
-          beestat.setting('runtime_sensor_detail_range_type') !== 'dynamic'
-        ) {
-          beestat.cache.delete('runtime_sensor');
-          beestat.setting({
-            'runtime_sensor_detail_range_dynamic': 1,
-            'runtime_sensor_detail_range_type': 'dynamic'
-          });
-        }
-      }));
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Past 1 Day')
+    .set_icon('numeric_1_box')
+    .set_callback(function() {
+      if (
+        beestat.setting('runtime_sensor_detail_range_dynamic') !== 1 ||
+        beestat.setting('runtime_sensor_detail_range_type') !== 'dynamic'
+      ) {
+        beestat.cache.delete('runtime_sensor');
+        beestat.setting({
+          'runtime_sensor_detail_range_dynamic': 1,
+          'runtime_sensor_detail_range_type': 'dynamic'
+        });
+      }
+    }));
 
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Past 3 Days')
-      .set_icon('numeric_3_box')
-      .set_callback(function() {
-        if (
-          beestat.setting('runtime_sensor_detail_range_dynamic') !== 3 ||
-          beestat.setting('runtime_sensor_detail_range_type') !== 'dynamic'
-        ) {
-          beestat.cache.delete('runtime_sensor');
-          beestat.setting({
-            'runtime_sensor_detail_range_dynamic': 3,
-            'runtime_sensor_detail_range_type': 'dynamic'
-          });
-        }
-      }));
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Past 3 Days')
+    .set_icon('numeric_3_box')
+    .set_callback(function() {
+      if (
+        beestat.setting('runtime_sensor_detail_range_dynamic') !== 3 ||
+        beestat.setting('runtime_sensor_detail_range_type') !== 'dynamic'
+      ) {
+        beestat.cache.delete('runtime_sensor');
+        beestat.setting({
+          'runtime_sensor_detail_range_dynamic': 3,
+          'runtime_sensor_detail_range_type': 'dynamic'
+        });
+      }
+    }));
 
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Past 7 Days')
-      .set_icon('numeric_7_box')
-      .set_callback(function() {
-        if (
-          beestat.setting('runtime_sensor_detail_range_dynamic') !== 7 ||
-          beestat.setting('runtime_sensor_detail_range_type') !== 'dynamic'
-        ) {
-          beestat.cache.delete('runtime_sensor');
-          beestat.setting({
-            'runtime_sensor_detail_range_dynamic': 7,
-            'runtime_sensor_detail_range_type': 'dynamic'
-          });
-        }
-      }));
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Past 7 Days')
+    .set_icon('numeric_7_box')
+    .set_callback(function() {
+      if (
+        beestat.setting('runtime_sensor_detail_range_dynamic') !== 7 ||
+        beestat.setting('runtime_sensor_detail_range_type') !== 'dynamic'
+      ) {
+        beestat.cache.delete('runtime_sensor');
+        beestat.setting({
+          'runtime_sensor_detail_range_dynamic': 7,
+          'runtime_sensor_detail_range_type': 'dynamic'
+        });
+      }
+    }));
 
     menu.add_menu_item(new beestat.component.menu_item()
       .set_text('Custom')
@@ -307,6 +306,7 @@ beestat.component.card.runtime_sensor_detail.prototype.decorate_top_right_ = fun
         (new beestat.component.modal.runtime_sensor_detail_custom()).render();
       }));
 
+  if (this.has_data_() === true) {
     menu.add_menu_item(new beestat.component.menu_item()
       .set_text('Download Chart')
       .set_icon('download')
diff --git a/js/component/card/runtime_thermostat_detail.js b/js/component/card/runtime_thermostat_detail.js
index f3151f0..979609c 100644
--- a/js/component/card/runtime_thermostat_detail.js
+++ b/js/component/card/runtime_thermostat_detail.js
@@ -237,62 +237,62 @@ beestat.component.card.runtime_thermostat_detail.prototype.decorate_top_right_ =
 
   var menu = (new beestat.component.menu()).render(parent);
 
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Past 1 Day')
+    .set_icon('numeric_1_box')
+    .set_callback(function() {
+      if (
+        beestat.setting('runtime_thermostat_detail_range_dynamic') !== 1 ||
+        beestat.setting('runtime_thermostat_detail_range_type') !== 'dynamic'
+      ) {
+        beestat.cache.delete('runtime_thermostat');
+        beestat.setting({
+          'runtime_thermostat_detail_range_dynamic': 1,
+          'runtime_thermostat_detail_range_type': 'dynamic'
+        });
+      }
+    }));
+
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Past 3 Days')
+    .set_icon('numeric_3_box')
+    .set_callback(function() {
+      if (
+        beestat.setting('runtime_thermostat_detail_range_dynamic') !== 3 ||
+        beestat.setting('runtime_thermostat_detail_range_type') !== 'dynamic'
+      ) {
+        beestat.cache.delete('runtime_thermostat');
+        beestat.setting({
+          'runtime_thermostat_detail_range_dynamic': 3,
+          'runtime_thermostat_detail_range_type': 'dynamic'
+        });
+      }
+    }));
+
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Past 7 Days')
+    .set_icon('numeric_7_box')
+    .set_callback(function() {
+      if (
+        beestat.setting('runtime_thermostat_detail_range_dynamic') !== 7 ||
+        beestat.setting('runtime_thermostat_detail_range_type') !== 'dynamic'
+      ) {
+        beestat.cache.delete('runtime_thermostat');
+        beestat.setting({
+          'runtime_thermostat_detail_range_dynamic': 7,
+          'runtime_thermostat_detail_range_type': 'dynamic'
+        });
+      }
+    }));
+
+  menu.add_menu_item(new beestat.component.menu_item()
+    .set_text('Custom')
+    .set_icon('calendar_edit')
+    .set_callback(function() {
+      (new beestat.component.modal.runtime_thermostat_detail_custom()).render();
+    }));
+
   if (this.has_data_() === true) {
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Past 1 Day')
-      .set_icon('numeric_1_box')
-      .set_callback(function() {
-        if (
-          beestat.setting('runtime_thermostat_detail_range_dynamic') !== 1 ||
-          beestat.setting('runtime_thermostat_detail_range_type') !== 'dynamic'
-        ) {
-          beestat.cache.delete('runtime_thermostat');
-          beestat.setting({
-            'runtime_thermostat_detail_range_dynamic': 1,
-            'runtime_thermostat_detail_range_type': 'dynamic'
-          });
-        }
-      }));
-
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Past 3 Days')
-      .set_icon('numeric_3_box')
-      .set_callback(function() {
-        if (
-          beestat.setting('runtime_thermostat_detail_range_dynamic') !== 3 ||
-          beestat.setting('runtime_thermostat_detail_range_type') !== 'dynamic'
-        ) {
-          beestat.cache.delete('runtime_thermostat');
-          beestat.setting({
-            'runtime_thermostat_detail_range_dynamic': 3,
-            'runtime_thermostat_detail_range_type': 'dynamic'
-          });
-        }
-      }));
-
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Past 7 Days')
-      .set_icon('numeric_7_box')
-      .set_callback(function() {
-        if (
-          beestat.setting('runtime_thermostat_detail_range_dynamic') !== 7 ||
-          beestat.setting('runtime_thermostat_detail_range_type') !== 'dynamic'
-        ) {
-          beestat.cache.delete('runtime_thermostat');
-          beestat.setting({
-            'runtime_thermostat_detail_range_dynamic': 7,
-            'runtime_thermostat_detail_range_type': 'dynamic'
-          });
-        }
-      }));
-
-    menu.add_menu_item(new beestat.component.menu_item()
-      .set_text('Custom')
-      .set_icon('calendar_edit')
-      .set_callback(function() {
-        (new beestat.component.modal.runtime_thermostat_detail_custom()).render();
-      }));
-
     menu.add_menu_item(new beestat.component.menu_item()
       .set_text('Download Chart')
       .set_icon('download')