diff --git a/admin_dashboard.yaml b/admin_dashboard.yaml
index d2eda81..7c71135 100644
--- a/admin_dashboard.yaml
+++ b/admin_dashboard.yaml
@@ -166,8 +166,6 @@ views:
           - type: entities
             entities:
               - entity: sensor.last_boot
-              - entity: sensor.hacs
-                name: HACS
               - entity: sensor.watchman_missing_entities
                 type: custom:multiple-entity-row
                 name: Missing
@@ -958,6 +956,7 @@ views:
             state_color: true
             title: Weather
         title: Climate Threshold Settings
+        column_span: 1
       - type: grid
         cards:
           - type: entities
@@ -1253,6 +1252,7 @@ views:
                 show_header_toggle: false
                 state_color: true
         title: Rabbit
+        column_span: 2
     max_columns: 4
     cards: []
   - title: Lights
@@ -1260,14 +1260,6 @@ views:
     icon: mdi:lightbulb
     type: sections
     sections:
-      - type: grid
-        cards:
-          - type: entities
-            entities:
-              - entity: switch.lightfx_listener
-            show_header_toggle: false
-            state_color: true
-        title: Lighting Master Switches
       - type: grid
         cards:
           - type: entities
@@ -1293,25 +1285,29 @@ views:
                 name: Wakeup Fade - Night
             show_header_toggle: false
             state_color: true
-        title: Lighting Settings
-      - type: grid
-        cards:
           - type: entities
             entities:
               - entity: input_text.basement_lights_restore
               - entity: input_text.living_room_lights_restore
             show_header_toggle: false
             state_color: true
+          - type: entities
+            entities:
+              - entity: switch.lightfx_listener
+            show_header_toggle: false
+            state_color: true
           - type: entities
             entities:
               - entity: sensor.tina_desk_scene
             show_header_toggle: false
             state_color: true
+        title: Lighting Settings
+        column_span: 2
     max_columns: 4
     cards: []
   - title: Notifications Settings
     path: notifications-settings
-    icon: mdi:bell
+    icon: mdi:volume-high
     type: sections
     sections:
       - type: grid