diff --git a/config/lovelace/home_dashboard/00_home.yaml b/config/lovelace/home_dashboard/00_home.yaml
index 38e054f..671be82 100644
--- a/config/lovelace/home_dashboard/00_home.yaml
+++ b/config/lovelace/home_dashboard/00_home.yaml
@@ -22,7 +22,7 @@ cards:
               - type: custom:button-card
                 template: small
                 entity: light.master_bedroom_main_lights
-                name: Bedroom
+                name: "M. Bedroom"
               - type: custom:button-card
                 template: small
                 entity: light.tuya_hallway_main_lights
@@ -65,16 +65,6 @@ cards:
         entities:
           - binary_sensor.sonos_recoverable
 
-      - type: entities
-        title: Manual controls
-        show_header_toggle: false
-        entities:
-          - input_boolean.speech_notifications
-          - input_boolean.guest_mode
-          - input_boolean.domestina
-          - input_boolean.sleep_mode
-          - input_boolean.georgi_home
-
   # Column 2: Sensors
   - type: vertical-stack
     cards:
@@ -87,9 +77,11 @@ cards:
           - type: custom:button-card
             template: small
             entity: binary_sensor.living_room_right_window_on_off_wrapper
+            name: Living room
           - type: custom:button-card
             template: small
             entity: binary_sensor.bedroom_right_window_on_off_wrapper
+            name: Master bedroom
 
       - type: entities
         title: Presence
@@ -100,19 +92,20 @@ cards:
           - device_tracker.tile_1bcb2b3021b9f96b
 
       - type: entities
-        title: Misc Badges
+        title: Manual controls
         show_header_toggle: false
         entities:
-          - sun.sun
-          - sensor.carbon_battery_level
-          - sensor.carbon_steps
-          - binary_sensor.updater
+          - input_boolean.speech_notifications
+          - input_boolean.guest_mode
+          - input_boolean.domestina
+          - input_boolean.sleep_mode
+          - input_boolean.georgi_home
 
   # Column 3: Misc
   - type: vertical-stack
+    title: Alarm
     cards:
       - type: entities
-        title: Alarm
         entities:
           - input_boolean.alarm_enabled
           - input_datetime.alarm_time
diff --git a/config/lovelace/home_dashboard/01_living_room.yaml b/config/lovelace/home_dashboard/01_living_room.yaml
index f79c610..1ea31dc 100644
--- a/config/lovelace/home_dashboard/01_living_room.yaml
+++ b/config/lovelace/home_dashboard/01_living_room.yaml
@@ -2,103 +2,125 @@ title: Living Room
 path: living-room
 icon: "mdi:sofa"
 badges: []
+panel: true
 cards:
-  - type: vertical-stack
+  - type: custom:layout-card
+    layout: horizontal
     cards:
-      - type: entities
-        title: Lights
-        show_header_toggle: false
-        entities:
-          - type: custom:slider-entity-row
-            entity: light.living_room_all_lights
-            name: All lights
-            toggle: true
-            step: 5
-          - type: custom:fold-entity-row
-            head:
-              entity: light.living_room_main_lights
-              name: Main lights
+      - type: vertical-stack
+        cards:
+          - type: entities
+            title: Lights
+            show_header_toggle: false
             entities:
               - type: custom:slider-entity-row
-                entity: light.living_room_main_lights
-                name: Brightness
-                hide_state: true
+                entity: light.living_room_all_lights
+                name: All lights
+                toggle: true
                 step: 5
-              - type: custom:slider-entity-row
-                entity: light.living_room_main_lights
-                name: Temperature
-                attribute: color_temp
-                hide_state: true
-                min: 153
-                max: 500
-                step: 5
-              - type: custom:decluttering-card
-                template: light_with_fade_and_switch
-                variables:
-                  - light: light.light_lohas_1
-                  - fade: switch.light_lohas_1_fade
-              - type: custom:decluttering-card
-                template: light_with_fade_and_switch
-                variables:
-                  - light: light.light_lohas_2
-                  - fade: switch.light_lohas_2_fade
-              - light.light_le_9
-              - light.light_le_10
-          - type: custom:fold-entity-row
-            head:
-              type: custom:decluttering-card
-              template: light_with_fade_and_switch
-              variables:
-                - light: light.pc
-                - fade: switch.pc_light_fade
+              - type: custom:fold-entity-row
+                head:
+                  entity: light.living_room_main_lights
+                  name: Main lights
+                entities:
+                  - type: custom:slider-entity-row
+                    entity: light.living_room_main_lights
+                    name: Brightness
+                    hide_state: true
+                    step: 5
+                  - type: custom:slider-entity-row
+                    entity: light.living_room_main_lights
+                    name: Temperature
+                    attribute: color_temp
+                    hide_state: true
+                    min: 153
+                    max: 500
+                    step: 5
+                  - type: custom:decluttering-card
+                    template: light_with_fade_and_switch
+                    variables:
+                      - light: light.light_lohas_1
+                      - fade: switch.light_lohas_1_fade
+                  - type: custom:decluttering-card
+                    template: light_with_fade_and_switch
+                    variables:
+                      - light: light.light_lohas_2
+                      - fade: switch.light_lohas_2_fade
+                  - light.light_le_9
+                  - light.light_le_10
+              - type: custom:fold-entity-row
+                head:
+                  type: custom:decluttering-card
+                  template: light_with_fade_and_switch
+                  variables:
+                    - light: light.pc
+                    - fade: switch.pc_light_fade
+                entities:
+                  - type: custom:slider-entity-row
+                    entity: light.pc
+                    name: Brightness
+                    hide_state: true
+                    step: 5
+
+          - type: custom:decluttering-card
+            template: sonos_media_player
+            variables:
+              - player: media_player.living_room
+
+          - type: "custom:mini-media-player"
+            entity: media_player.living_room_tv
+
+          - type: glance
+            show_state: false
             entities:
-              - type: custom:slider-entity-row
-                entity: light.pc
-                name: Brightness
-                hide_state: true
-                step: 5
+              - binary_sensor.titanium
+              - entity: script.titanium_start
+                name: Start
 
-      - type: glance
-        show_state: false
-        entities:
-          - binary_sensor.titanium
-          - entity: script.titanium_start
-            name: Start
+      - type: vertical-stack
+        cards:
+          - type: glance
+            title: Window
+            show_icon: true
+            show_name: false
+            show_state: true
+            entities:
+              - binary_sensor.living_room_right_window_on_off_wrapper
+              - sensor.living_room_right_window_power
 
-      - type: custom:decluttering-card
-        template: sonos_media_player
-        variables:
-          - player: media_player.living_room
+          - type: vertical-stack
+            cards:
+              - type: glance
+                title: Sensors
+                entities:
+                  - entity: binary_sensor.motion_2_ias_zone
+                  - entity: sensor.motion_2_illuminance
+                  - entity: binary_sensor.motion_2_occupancy
+                  - entity: sensor.motion_2_power
 
-      - type: "custom:mini-media-player"
-        entity: media_player.living_room_tv
+          - type: "custom:mini-graph-card"
+            animate: true
+            points_per_hour: 1
+            hours_to_show: 48
+            show:
+              graph: bar
+              average: true
+              extrema: true
+            entities:
+              - entity: sensor.motion_2_illuminance
 
-      - type: "custom:mini-media-player"
-        entity: media_player.playstation_4
+      - type: vertical-stack
+        cards:
+          - type: picture-entity
+            aspect_ratio: 50%
+            entity: camera.amcrest_camera
+            show_name: true
+            show_state: true
 
-  - type: vertical-stack
-    cards:
-      - type: glance
-        title: Window
-        show_icon: true
-        show_name: false
-        show_state: true
-        entities:
-          - binary_sensor.living_room_right_window_on_off_wrapper
-          - sensor.living_room_right_window_power
-
-  - type: vertical-stack
-    cards:
-      - type: picture-entity
-        aspect_ratio: 50%
-        entity: camera.amcrest_camera
-        show_name: true
-        show_state: true
-
-      - type: entities
-        title: Camera Controls
-        show_header_toggle: false
-        entities:
-          - switch.camera
-          - binary_sensor.amcrest_camera_online
-          - binary_sensor.amcrest_camera_motion_detected
+          - type: entities
+            title: Camera Controls
+            show_header_toggle: false
+            entities:
+              - switch.camera
+              - binary_sensor.amcrest_camera_online
+              - binary_sensor.amcrest_camera_motion_detected
diff --git a/config/lovelace/home_dashboard/03_kitchen.yaml b/config/lovelace/home_dashboard/03_kitchen.yaml
index 4af2abd..8c10eb9 100644
--- a/config/lovelace/home_dashboard/03_kitchen.yaml
+++ b/config/lovelace/home_dashboard/03_kitchen.yaml
@@ -2,30 +2,59 @@ title: Kitchen
 path: kitchen
 icon: "mdi:chef-hat"
 badges: []
+panel: true
 cards:
-  - type: entities
-    title: Lights
-    show_header_toggle: false
-    entities:
-      - light.tuya_kitchen_main_lights
-      - type: divider
-      - type: custom:fold-entity-row
-        entity: light.kitchen_main_lights
-        name: Main lights
-        entities:
-          - light.light_le_11
-          - light.light_le_12
-          - light.light_orbecco_1
+  - type: custom:layout-card
+    layout: horizontal
+    max_columns: 3
+    cards:
+      - type: vertical-stack
+        cards:
+          - type: entities
+            title: Lights
+            show_header_toggle: false
+            entities:
+              - light.tuya_kitchen_main_lights
+              - type: divider
+              - type: custom:fold-entity-row
+                entity: light.kitchen_main_lights
+                name: Main lights
+                entities:
+                  - light.light_le_11
+                  - light.light_le_12
+                  - light.light_orbecco_1
 
-  - type: custom:decluttering-card
-    template: sonos_media_player
-    variables:
-      - player: media_player.kitchen
-  - type: entities
-    title: Brita Filter
-    icon: mdi:filter-outline
-    entities:
-      - input_number.brita_remaining_liters
-      - input_datetime.brita_next_change
-      - binary_sensor.brita_should_change_filter
-      - script.brita_new_filter
+          - type: custom:decluttering-card
+            template: sonos_media_player
+            variables:
+              - player: media_player.kitchen
+      - type: vertical-stack
+        cards:
+          - type: glance
+            title: Sensors
+            entities:
+              - entity: binary_sensor.motion_1_ias_zone
+              - entity: sensor.motion_1_illuminance
+              - entity: binary_sensor.motion_1_occupancy
+              - entity: sensor.motion_1_power
+          - type: "custom:mini-graph-card"
+            animate: true
+            points_per_hour: 1
+            hours_to_show: 48
+            show:
+              graph: bar
+              average: true
+              extrema: true
+            entities:
+              - entity: sensor.motion_1_illuminance
+
+      - type: vertical-stack
+        cards:
+          - type: entities
+            title: Brita Filter
+            icon: mdi:filter-outline
+            entities:
+              - input_number.brita_remaining_liters
+              - input_datetime.brita_next_change
+              - binary_sensor.brita_should_change_filter
+              - script.brita_new_filter
diff --git a/config/lovelace/home_dashboard/08_network.yaml b/config/lovelace/home_dashboard/08_network.yaml
index 5a31a0e..cab058f 100644
--- a/config/lovelace/home_dashboard/08_network.yaml
+++ b/config/lovelace/home_dashboard/08_network.yaml
@@ -6,7 +6,7 @@ cards:
   - type: vertical-stack
     cards:
       - type: "custom:mini-graph-card"
-        graph: bar
+        animate: true
         points_per_hour: 1
         hours_to_show: 72
         show:
diff --git a/config/lovelace/home_dashboard/09_system.yaml b/config/lovelace/home_dashboard/09_system.yaml
index 169b7b5..cacf20e 100644
--- a/config/lovelace/home_dashboard/09_system.yaml
+++ b/config/lovelace/home_dashboard/09_system.yaml
@@ -1,7 +1,7 @@
 title: System
 path: system
 icon: "mdi:hammer-wrench"
-badges: []
+badges: [binary_sensor.updater]
 cards:
   - type: entities
     title: Automations
@@ -118,6 +118,9 @@ cards:
     title: Batteries
     show_header_toggle: false
     entities:
+      - type: custom:battery-entity
+        entity: sensor.carbon_battery_level
+      - type: divider
       - type: custom:battery-entity
         entity: sensor.front_door_power
       - type: custom:battery-entity
diff --git a/config/lovelace/home_dashboard/11_test.yaml b/config/lovelace/home_dashboard/11_test.yaml
index 51896b0..57bc34f 100644
--- a/config/lovelace/home_dashboard/11_test.yaml
+++ b/config/lovelace/home_dashboard/11_test.yaml
@@ -8,20 +8,6 @@ cards:
       action: call-service
       service: frontend.reload_themes
 
-  - type: glance
-    entities:
-      - entity: binary_sensor.motion_1_ias_zone
-      - entity: sensor.motion_1_illuminance
-      - entity: binary_sensor.motion_1_occupancy
-      - entity: sensor.motion_1_power
-
-  - type: glance
-    entities:
-      - entity: binary_sensor.motion_2_ias_zone
-      - entity: sensor.motion_2_illuminance
-      - entity: binary_sensor.motion_2_occupancy
-      - entity: sensor.motion_2_power
-
   - type: entities
     entities:
       - entity: sensor.cube_analog_input
@@ -30,39 +16,6 @@ cards:
       - entity: sensor.carbon_activity
       - entity: sensor.carbon_last_update_trigger
 
-  - type: "custom:light-entity-card"
-    brightness: true
-    brightness_icon: weather-sunny
-    color_picker: true
-    color_temp: true
-    color_wheel: true
-    effects_list: true
-    entity: light.pc
-    full_width_sliders: false
-    group: false
-    persist_features: false
-    show_slider_percent: false
-    smooth_color_wheel: true
-    temperature_icon: thermometer
-    white_icon: file-word-box
-    white_value: true
-
-  - type: "custom:light-entity-card"
-    brightness: true
-    brightness_icon: weather-sunny
-    color_picker: true
-    color_temp: true
-    color_wheel: true
-    effects_list: true
-    entity: light.bedside_light
-    full_width_sliders: false
-    group: false
-    show_slider_percent: true
-    smooth_color_wheel: true
-    temperature_icon: thermometer
-    white_icon: file-word-box
-    white_value: true
-
   - type: "custom:mini-graph-card"
     animate: true
     entities:
diff --git a/config/tablet-lovelace.yaml b/config/tablet-lovelace.yaml
index 3f62232..d26a203 100644
--- a/config/tablet-lovelace.yaml
+++ b/config/tablet-lovelace.yaml
@@ -49,7 +49,7 @@ views:
                   - type: custom:button-card
                     template: small
                     entity: light.master_bedroom_main_lights
-                    name: Bedroom
+                    name: "M. Bedroom"
                   - type: custom:button-card
                     template: small
                     entity: light.tuya_hallway_main_lights