diff --git a/dashboards/klima.yaml b/dashboards/klima.yaml
index a3e2bee..d58a4e8 100644
--- a/dashboards/klima.yaml
+++ b/dashboards/klima.yaml
@@ -1,30 +1,30 @@
 views:
   - title: Home
     path: home
-    cards:
-      - type: weather-forecast
-        entity: weather.openweathermap
-        forecast_type: daily
-        name: Weather Forecast
-
-      - type: horizontal-stack
+    type: sections
+    max_columns: 2
+    sections:
+      - column_span: 2
         cards:
-          - type: vertical-stack
-            cards:
-              - type: entities
-                title: Living Room Climate
-                entities:
-                  - entity: sensor.thermometer_wz_temperature
-                    name: Temperature
-                  - entity: sensor.thermometer_wz_humidity
-                    name: Humidity
-                  - entity: sensor.thermometer_wz_battery
-                    name: Battery
+          - type: weather-forecast
+            entity: weather.openweathermap
+            forecast_type: daily
+            name: Weather Forecast
+
+      - cards:
+          - type: entities
+            title: Living Room
+            entities:
+              - entity: sensor.thermometer_wz_temperature
+                name: Temperature
+              - entity: sensor.thermometer_wz_humidity
+                name: Humidity
+              - entity: sensor.thermometer_wz_battery
+                name: Battery
               - type: custom:fan-percent-button-row
                 entity: fan.ventilator_unten
-                name: Living Room Fan
+                name: Fan
           - type: custom:mini-graph-card
-            name: Living Room Temperature
             entities:
               - entity: sensor.thermometer_wz_temperature
               - entity: sensor.thermometer_wz_humidity
@@ -34,28 +34,24 @@ views:
             show:
               labels: true
               icon: false
-              name: true
+              name: false
 
-      - type: horizontal-stack
-        cards:
-          - type: vertical-stack
-            cards:
-              - type: entities
-                title: Bedroom Climate
-                entities:
-                  - entity: sensor.thermometer_sz_temperature_4
-                    name: Temperature
-                  - entity: sensor.thermometer_sz_humidity_4
-                    name: Humidity
-                  - entity: sensor.thermometer_sz_battery_4
-                    name: Battery
-                  - entity: climate.klimaanlage
-                    name: Bedroom AC
+      - cards:
+          - type: entities
+            title: Bedroom
+            entities:
+              - entity: sensor.thermometer_sz_temperature_4
+                name: Temperature
+              - entity: sensor.thermometer_sz_humidity_4
+                name: Humidity
+              - entity: sensor.thermometer_sz_battery_4
+                name: Battery
+              - entity: climate.klimaanlage
+                name: AC
               - type: custom:fan-percent-button-row
                 entity: fan.ventilator_schlafzimmer
-                name: Bedroom Fan
+                name: Fan
           - type: custom:mini-graph-card
-            name: Bedroom Temperature
             entities:
               - entity: sensor.thermometer_sz_temperature_4
               - entity: sensor.thermometer_sz_humidity_4
@@ -65,34 +61,26 @@ views:
             show:
               labels: true
               icon: false
-              name: true
+              name: false
 
-      - type: horizontal-stack
-        cards:
-          - type: vertical-stack
-            cards:
-              - type: entities
-                title: Office Climate
-                entities:
-                  - entity: sensor.thermometer_buro_temperature_2
-                    name: Temperature
-                  - entity: sensor.thermometer_buro_humidity_2
-                    name: Humidity
-                  - entity: sensor.thermometer_buro_battery_2
-                    name: Battery
-                  - entity: climate.echos_mobile_klimaanlage_mit_wifi
-                    name: Office AC
+      - cards:
+          - type: entities
+            title: Office
+            entities:
+              - entity: sensor.thermometer_buro_temperature_2
+                name: Temperature
+              - entity: sensor.thermometer_buro_humidity_2
+                name: Humidity
+              - entity: sensor.thermometer_buro_battery_2
+                name: Battery
+              - entity: climate.echos_mobile_klimaanlage_mit_wifi
+                name: AC
               - type: custom:fan-percent-button-row
                 entity: fan.luftzirkulator
-                name: Office Fan
-              - type: button
-                entity: input_boolean.ac_automation_enabled
-                tap_action:
-                  action: toggle
+                name: Fan
+              - entity: input_boolean.ac_automation_enabled
                 name: AC Automation
-                icon: mdi:air-conditioner
           - type: custom:mini-graph-card
-            name: Office Temperature
             entities:
               - entity: sensor.thermometer_buro_temperature_2
               - entity: sensor.thermometer_buro_humidity_2
@@ -102,23 +90,19 @@ views:
             show:
               labels: true
               icon: false
-              name: true
+              name: false
 
-      - type: horizontal-stack
-        cards:
-          - type: vertical-stack
-            cards:
-              - type: entities
-                title: Bathroom Climate
-                entities:
-                  - entity: sensor.thermometer_bad_temperature_3
-                    name: Temperature
-                  - entity: sensor.thermometer_bad_humidity_3
-                    name: Humidity
-                  - entity: sensor.thermometer_bad_battery_3
-                    name: Battery
+      - cards:
+          - type: entities
+            title: Bathroom
+            entities:
+              - entity: sensor.thermometer_bad_temperature_3
+                name: Temperature
+              - entity: sensor.thermometer_bad_humidity_3
+                name: Humidity
+              - entity: sensor.thermometer_bad_battery_3
+                name: Battery
           - type: custom:mini-graph-card
-            name: Bathroom Temperature
             entities:
               - entity: sensor.thermometer_bad_temperature_3
               - entity: sensor.thermometer_bad_humidity_3
@@ -128,4 +112,4 @@ views:
             show:
               labels: true
               icon: false
-              name: true
+              name: false