diff --git a/lovelace/00_home.yaml b/lovelace/00_home.yaml
index 836ed18..6d18149 100644
--- a/lovelace/00_home.yaml
+++ b/lovelace/00_home.yaml
@@ -3,82 +3,91 @@ path: default_view
 icon: "mdi:home"
 badges: []
 cards:
-  - type: entities
-    title: Lights
-    entities:
-      - entity: light.living_room_all_lights
-      - entity: light.living_room_main_lights
-      - entity: light.pc
-    show_header_toggle: false
+  # Column 1: Active Controls
+  - type: vertical-stack
+    cards:
+      - type: entities
+        title: Lights
+        entities:
+          - entity: light.living_room_all_lights
+          - entity: light.living_room_main_lights
+          - entity: light.pc
+        show_header_toggle: false
 
-  - type: entities
-    title: Manual Control
-    entities:
-      - entity: input_boolean.sleep_mode
-      - entity: input_boolean.guest_mode
-      - entity: input_boolean.domestina
-      - entity: input_boolean.speech_notifications
-      - entity: input_boolean.georgi_home
-    show_header_toggle: false
+      - type: entities
+        title: Devices
+        entities:
+          - entity: switch.camera
+          - entity: media_player.living_room_tv
+          - entity: fan.philips_airpurifier
+        show_header_toggle: false
 
-  - type: entities
-    title: Sensors
-    entities:
-      - entity: binary_sensor.front_door_on_off_wrapper
-      - entity: binary_sensor.living_room_right_window_on_off_wrapper
-      - entity: binary_sensor.bedroom_right_window_on_off_wrapper
-    show_header_toggle: false
+      - type: "custom:mini-media-player"
+        artwork: cover
+        entity: media_player.master_bedroom
+        hide:
+          power_state: false
+          shuffle: false
+        idle_view:
+          when_idle: true
+          when_standby: true
+        platform: sonos
+        show_source: true
+        source: full
 
-  - type: entities
-    title: Devices
-    entities:
-      - entity: switch.camera
-      - entity: media_player.living_room_tv
-      - entity: fan.philips_airpurifier
-    show_header_toggle: false
+      - type: entities
+        title: Manual Overrides
+        entities:
+          - entity: input_boolean.sleep_mode
+          - entity: input_boolean.guest_mode
+          - entity: input_boolean.domestina
+          - entity: input_boolean.speech_notifications
+          - entity: input_boolean.georgi_home
+        show_header_toggle: false
 
-  - type: entities
-    title: Presence
-    entities:
-      - entity: binary_sensor.georgi_home
-      - entity: device_tracker.carbon
-      - entity: device_tracker.tile_1bcb2b3021b9f96b
-    show_header_toggle: false
+  # Column 2: Sensors
+  - type: vertical-stack
+    cards:
+      - type: entities
+        title: Sensors
+        entities:
+          - entity: binary_sensor.front_door_on_off_wrapper
+          - entity: binary_sensor.living_room_right_window_on_off_wrapper
+          - entity: binary_sensor.bedroom_right_window_on_off_wrapper
+        show_header_toggle: false
 
-  - type: "custom:travel-time-card"
-    title: "Travel time"
-    columns:
-      - name
-      - duration
-      - distance
-    entities:
-      - entity: sensor.home_to_work
-      - entity: sensor.work_to_home
+      - type: entities
+        title: Presence
+        entities:
+          - entity: binary_sensor.georgi_home
+          - entity: device_tracker.carbon
+          - entity: device_tracker.tile_1bcb2b3021b9f96b
+        show_header_toggle: false
 
-  - type: "custom:mini-media-player"
-    artwork: cover
-    entity: media_player.master_bedroom
-    hide:
-      power_state: false
-      shuffle: false
-    idle_view:
-      when_idle: true
-      when_standby: true
-    platform: sonos
-    show_source: true
-    source: full
+      - type: entities
+        title: Misc Badges
+        entities:
+          - entity: sun.sun
+          - entity: sensor.carbon_battery_level
+          - entity: sensor.carbon_steps
+          - entity: binary_sensor.updater
+        show_header_toggle: false
 
-  - type: "custom:weather-card"
-    current: true
-    details: true
-    entity: weather.dark_sky
-    forecast: true
+  # Column 3: Misc
+  - type: vertical-stack
+    cards:
+      - type: "custom:weather-card"
+        current: true
+        details: true
+        entity: weather.dark_sky
+        forecast: true
 
-  - type: entities
-    title: Misc Badges
-    entities:
-      - entity: sun.sun
-      - entity: sensor.carbon_battery_level
-      - entity: sensor.carbon_steps
-      - entity: binary_sensor.updater
-    show_header_toggle: false
+      - type: "custom:travel-time-card"
+        title: "Travel time"
+        columns:
+          - name
+          - duration
+          - distance
+        entities:
+          - entity: sensor.home_to_work
+          - entity: sensor.work_to_home
diff --git a/lovelace/01_living_room.yaml b/lovelace/01_living_room.yaml
index a0e57c5..618a29c 100644
--- a/lovelace/01_living_room.yaml
+++ b/lovelace/01_living_room.yaml
@@ -24,19 +24,21 @@ cards:
       - entity: light.living_room_4
       - entity: light.pc
 
-  - type: picture-entity
-    aspect_ratio: 50%
-    entity: camera.amcrest_camera
-    show_name: true
-    show_state: true
+  - 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:
-      - entity: switch.camera
-      - entity: binary_sensor.amcrest_camera_online
-      - entity: binary_sensor.amcrest_camera_motion_detected
+      - type: entities
+        title: Camera Controls
+        show_header_toggle: false
+        entities:
+          - entity: switch.camera
+          - entity: binary_sensor.amcrest_camera_online
+          - entity: binary_sensor.amcrest_camera_motion_detected
 
   - type: media-control
     entity: media_player.living_room_tv
diff --git a/lovelace/02_master_bedroom.yaml b/lovelace/02_master_bedroom.yaml
index 2b9c9b7..11e153c 100644
--- a/lovelace/02_master_bedroom.yaml
+++ b/lovelace/02_master_bedroom.yaml
@@ -3,48 +3,50 @@ path: master-bedroom
 icon: "mdi:bed-empty"
 badges: []
 cards:
-  - type: "custom:mini-graph-card"
-    animate: true
-    entities:
-      - entity: sensor.bedroom_weather_temperature
-        index: 0
-        name: Temperature
-    line_width: 3
-    points_per_hour: 1
-    show:
-      average: true
-      extrema: true
-
-  - type: horizontal-stack
+  - type: vertical-stack
     cards:
       - type: "custom:mini-graph-card"
-        name: Humidity
-        icon: "mdi:water"
-        font_size: 75
-        line_color: green
-        line_width: 8
+        animate: true
         entities:
-          - entity: sensor.bedroom_weather_humidity
+          - entity: sensor.bedroom_weather_temperature
             index: 0
+            name: Temperature
+        line_width: 3
+        points_per_hour: 1
+        show:
+          average: true
+          extrema: true
 
-      - type: "custom:mini-graph-card"
-        name: Air Quality
-        entities:
-          - entity: sensor.purifier_air_quality
-            index: 0
-        font_size: 75
-        icon: "mdi:weather-windy"
-        line_color: "#e74c3c"
-        line_width: 8
+      - type: horizontal-stack
+        cards:
+          - type: "custom:mini-graph-card"
+            name: Humidity
+            icon: "mdi:water"
+            font_size: 75
+            line_color: green
+            line_width: 8
+            entities:
+              - entity: sensor.bedroom_weather_humidity
+                index: 0
 
-      - type: "custom:mini-graph-card"
-        name: Pressure
-        entities:
-          - entity: sensor.bedroom_weather_pressure
-            index: 0
-        font_size: 75
-        line_color: var(--accent-color)
-        line_width: 8
+          - type: "custom:mini-graph-card"
+            name: Air Quality
+            entities:
+              - entity: sensor.purifier_air_quality
+                index: 0
+            font_size: 75
+            icon: "mdi:weather-windy"
+            line_color: "#e74c3c"
+            line_width: 8
+
+          - type: "custom:mini-graph-card"
+            name: Pressure
+            entities:
+              - entity: sensor.bedroom_weather_pressure
+                index: 0
+            font_size: 75
+            line_color: var(--accent-color)
+            line_width: 8
 
   - type: glance
     title: Window