diff --git a/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml b/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml
index 6737a79e..4060b4ae 100755
--- a/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml
+++ b/custom_components/dwains_dashboard/lovelace/views/main/02.lights.yaml
@@ -1,6 +1,13 @@
 # dwains_dashboard
 
 - path: lights
+  {% if _dd_config.lights %}
+  {% if _dd_config.lights["main_menu"] and _dd_config.lights["main_menu"] == 'false' %}
+  visible: false
+  {% else %}
+  visible: true
+  {% endif %}
+  {% endif %}
   icon: {{ _dd_icons.menu_lights|default('mdi:lightbulb-group') }}
   title: {{ _dd_trans.all_lights.title }}
   panel: true
@@ -169,4 +176,4 @@
                       items_classes: 'col-xs-12'
                   {% endif %}
               {% endif %}
-              {% endfor %}
\ No newline at end of file
+              {% endfor %}
diff --git a/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml b/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml
index 5c0e6ba3..2b8e94e7 100755
--- a/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml
+++ b/custom_components/dwains_dashboard/lovelace/views/main/rooms/room.yaml
@@ -862,9 +862,15 @@
                 item_classes: 'col-xs-12 col-sm-12 col-md-12 col-lg-12'
               {% endif %}
               {% for more_entity in room["page_entities"]["entities"] %}
-              - type: custom:button-card
-                entity: {{ more_entity["entity"] }}
-                template: room_more_entity
+              {% if more_entity["type"] and more_entity["type"] == 'graph' %}
+              - type: sensor
+                entity: {{ more_entity["entity"] }}
+                graph: line
+              {% else %}
+              - type: custom:button-card
+                entity: {{ more_entity["entity"] }}
+                template: room_more_entity
+              {% endif %}
                 {% if more_entity["entity"].split('.')[0] in ('switch', 'light') %}
                 tap_action:
                     action: toggle