diff --git a/config/configuration.yaml b/config/configuration.yaml
index ca4c47b..6636d87 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -47,6 +47,7 @@ lovelace:
       mode: yaml
       title: Hallway Dashboard
       icon: mdi:tablet-dashboard
+      show_in_sidebar: false
       filename: hallway-lovelace.yaml
 
 # https://www.home-assistant.io/components/map
diff --git a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
index 073fb40..8e069e5 100644
--- a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml
@@ -5,69 +5,69 @@ cards:
   # Column 1
   - type: vertical-stack
     cards:
-      - type: vertical-stack
+      - type: custom:button-card
+        template: [hallway_dashboard_mode]
+      - type: horizontal-stack
         cards:
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                template: half
-                icon: none
-                entity: light.all
-                name: All
-              - type: custom:button-card
-                template: half
-                icon: none
-                entity: light.ceiling
-                name: Ceiling
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.living_room
-                name: Living room
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.living_room_main
-                name: Main
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.light_avatar_small_2
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.living_room_ambient
-                name: Ambient
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.master_bedroom
-                name: Bedroom
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.master_bedroom_main
-                name: Main
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.bed_led
-                name: Bed
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.bedside
-                name: Bedside
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.tuya_kitchen
-                name: Kitchen
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.tuya_hallway_main
-                name: Hallway
-              - type: custom:button-card
-                template: [mobile, with_state_background]
-                entity: light.hallway_entrance
-                name: Entrance
+          - type: custom:button-card
+            template: half
+            icon: none
+            entity: light.all
+            name: All
+          - type: custom:button-card
+            template: half
+            icon: none
+            entity: light.ceiling
+            name: Ceiling
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.living_room
+            name: Living room
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.living_room_main
+            name: Main
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.light_avatar_small_2
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.living_room_ambient
+            name: Ambient
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.master_bedroom
+            name: Bedroom
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.master_bedroom_main
+            name: Main
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.bed_led
+            name: Bed
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.bedside
+            name: Bedside
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.tuya_kitchen
+            name: Kitchen
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.tuya_hallway_main
+            name: Hallway
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.hallway_entrance
+            name: Entrance
 
       - type: custom:decluttering-card
         template: media_with_controls
@@ -81,8 +81,6 @@ cards:
     cards:
       - type: horizontal-stack
         cards:
-          - type: custom:button-card
-            template: [hallway_dashboard_mode]
           - type: custom:button-card
             template: [mobile, with_state_background]
             entity: input_boolean.speech_notifications
diff --git a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
index 77b31f6..615bc79 100644
--- a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml
@@ -2,5 +2,174 @@ type: custom:layout-card
 layout: horizontal
 max_columns: 2
 cards:
-  - type: custom:button-card
-    template: [hallway_dashboard_mode]
+  # Column 1
+  - type: vertical-stack
+    cards:
+      - type: custom:button-card
+        template: [hallway_dashboard_mode]
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: half
+            icon: none
+            entity: light.all
+            name: All
+          - type: custom:button-card
+            template: half
+            icon: none
+            entity: light.ceiling
+            name: Ceiling
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.living_room
+            name: Living room
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.living_room_main
+            name: Main
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.light_avatar_small_2
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.living_room_ambient
+            name: Ambient
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.master_bedroom
+            name: Bedroom
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.master_bedroom_main
+            name: Main
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.bed_led
+            name: Bed
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.bedside
+            name: Bedside
+      - type: horizontal-stack
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.tuya_kitchen
+            name: Kitchen
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.tuya_hallway_main
+            name: Hallway
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: light.hallway_entrance
+            name: Entrance
+
+      - type: custom:decluttering-card
+        template: media_with_controls
+        variables:
+          - player: media_player.master_bedroom
+          - player_name: Bedroom
+          - title: ""
+
+  # Column 2
+  - type: vertical-stack
+    cards:
+      - type: grid
+        columns: 4
+        square: false
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.georgi_home
+            name: Georgi home?
+            tap_action:
+              action: call-service
+              service: input_boolean.toggle
+              service_data:
+                entity_id: input_boolean.georgi_home
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: input_boolean.speech_notifications
+            name: Speech
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: input_boolean.guest_mode
+            tap_action:
+              action: toggle
+          - type: custom:button-card
+            template: mobile
+            entity: media_player.living_room_tv
+            name: TV
+            icon: mdi:television
+            tap_action:
+              action: toggle
+            state:
+              - value: 'playing'
+                styles: &on_styles
+                  card:
+                    - background-color: var(--primary-color)
+                    - color: black
+                  icon:
+                    - color: black
+              - value: 'standby'
+                styles: *on_styles
+              - value: 'on'
+                styles: *on_styles
+              - value: 'home'
+                styles: *on_styles
+              - value: 'idle'
+                styles: *on_styles
+          - type: custom:button-card
+            template: [mobile, with_state_background, with_state_indicator]
+            entity: switch.titanium
+            variables:
+              state_indicator_id: automation.titanium_turn_off_when_idle
+          - type: custom:button-card
+            template: [ac_button, mobile]
+          - type: custom:button-card
+            template: [radiator_button, mobile]
+            entity: climate.living_room_radiator_mode
+            name: "Living room"
+          - type: custom:button-card
+            template: [radiator_button, mobile]
+            entity: climate.bedroom_radiator_mode
+            name: "Bedroom"
+          - type: custom:button-card
+            template: [radiator_button, mobile]
+            entity: climate.kitchen_radiator_mode
+            name: "Kitchen"
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: switch.camera
+            name: Camera
+          - type: custom:button-card
+            template: [mobile, with_state_indicator]
+            entity: fan.philips_airpurifier
+            variables:
+              state_indicator_id: binary_sensor.purifier_filter_needs_change
+              state_indicator_size: 5px
+              state_indicator_off_size: 0px
+              state_indicator_on_color: var(--color-red)
+              state_on_indicator_on_color: var(--color-red)
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: vacuum.vacuum
+            name: Vacuum
+
+      - type: entities
+        entities:
+          - type: custom:decluttering-card
+            template: percentage_card
+            variables:
+              - name: Quarantine
+              - entity: sensor.quarantined_percent
+              - icon: mdi:percent
+              - orange: 100
+              - red: 100
+          - entity: sensor.quarantine_times_left
+            name: Times left
diff --git a/config/lovelace/hallway_dashboard/leaving_home_dashboard.yaml b/config/lovelace/hallway_dashboard/leaving_home_dashboard.yaml
index 77b31f6..a687041 100644
--- a/config/lovelace/hallway_dashboard/leaving_home_dashboard.yaml
+++ b/config/lovelace/hallway_dashboard/leaving_home_dashboard.yaml
@@ -2,5 +2,60 @@ type: custom:layout-card
 layout: horizontal
 max_columns: 2
 cards:
-  - type: custom:button-card
-    template: [hallway_dashboard_mode]
+  - type: vertical-stack
+    cards:
+      - type: custom:button-card
+        template: [hallway_dashboard_mode]
+      - type: custom:weather-card
+        current: true
+        details: true
+        entity: weather.dark_sky
+        forecast: true
+  - type: vertical-stack
+    cards:
+      - type: grid
+        square: false
+        columns: 4
+        cards:
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.living_room_right_window
+            name: Living room
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.bedroom_left_window
+            name: Bedroom left
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.bedroom_right_window
+            name: Bedroom right
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.kitchen_window
+            name: Kitchen
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.front_door
+          - type: custom:button-card
+            template: [mobile, with_state_background]
+            entity: binary_sensor.bedroom_door
+
+      - type: custom:mini-graph-card
+        hours_to_show: 72
+        line_width: 2
+        entities:
+          - sensor.dark_sky_precip_probability
+          - sensor.dark_sky_cloud_coverage
+
+      - type: entities
+        entities:
+          - type: custom:decluttering-card
+            template: percentage_card
+            variables:
+              - name: Quarantine
+              - entity: sensor.quarantined_percent
+              - icon: mdi:percent
+              - orange: 100
+              - red: 100
+          - entity: sensor.quarantine_times_left
+            name: Times left