diff --git a/dashboards/views/06_varme.yaml b/dashboards/views/06_varme.yaml
index da3abd2..f0e6803 100644
--- a/dashboards/views/06_varme.yaml
+++ b/dashboards/views/06_varme.yaml
@@ -9,216 +9,213 @@ sections:
 
   - type: grid
     cards:
-      - type: heading
-        heading: Andreas
-
-      - type: horizontal-stack
-        cards:
-          - type: custom:apexcharts-card
-            graph_span: 24h
-            header:
-              show: true
-              title: Temperaturer
-              show_states: true
-              colorize_states: true
-            now:
-              show: true
-              label: Nu
-            apex_config:
-              chart:
-                height: 240
-              grid:
-                strokeDashArray: 2
-              xaxis:
-                type: datetime
-                labels:
-                  datetimeFormatter:
-                    hour: HH:mm
-              yaxis:
-                decimalsInFloat: 1
-                tickAmount: 6
-            series:
-              - entity: sensor.sovevaerelse_stue_temperatur
-                name: Netatmo
-              - entity: sensor.hue_motion_sensor_2_temperature_2
-                name: Hue
-
-          - type: vertical-stack
-            cards:
-              - type: thermostat
-                entity: climate.andreas
-                name: Gulvvarme
-
-              - type: grid
-                columns: 2
-                square: false
-                cards:
-                  - type: custom:button-card
-                    entity: climate.andreas
-                    name: -0.5°
-                    icon: mdi:minus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.andreas
-                        temperature: '[[[ return Math.max(7, (entity.attributes.temperature || 0) - 0.5); ]]]'
-
-                  - type: custom:button-card
-                    entity: climate.andreas
-                    name: +0.5°
-                    icon: mdi:plus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.andreas
-                        temperature: '[[[ return Math.min(35, (entity.attributes.temperature || 0) + 0.5); ]]]'
-
-  - type: grid
-    cards:
-      - type: heading
-        heading: Daniel
-
-      - type: horizontal-stack
-        cards:
-          - type: custom:apexcharts-card
-            graph_span: 24h
-            header:
-              show: true
-              title: Temperaturer
-              show_states: true
-              colorize_states: true
-            now:
-              show: true
-              label: Nu
-            apex_config:
-              chart:
-                height: 240
-              grid:
-                strokeDashArray: 2
-              xaxis:
-                type: datetime
-                labels:
-                  datetimeFormatter:
-                    hour: HH:mm
-              yaxis:
-                decimalsInFloat: 1
-                tickAmount: 6
-            series:
-              - entity: sensor.sovevaerelse_daniel_temperatur
-                name: Netatmo
-              - entity: sensor.hue_motion_sensor_2_temperature
-                name: Hue
-
-          - type: vertical-stack
-            cards:
-              - type: thermostat
-                entity: climate.daniel
-                name: Gulvvarme
-
-              - type: grid
-                columns: 2
-                square: false
-                cards:
-                  - type: custom:button-card
-                    entity: climate.daniel
-                    name: -0.5°
-                    icon: mdi:minus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.daniel
-                        temperature: '[[[ return Math.max(7, (entity.attributes.temperature || 0) - 0.5); ]]]'
-
-                  - type: custom:button-card
-                    entity: climate.daniel
-                    name: +0.5°
-                    icon: mdi:plus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.daniel
-                        temperature: '[[[ return Math.min(35, (entity.attributes.temperature || 0) + 0.5); ]]]'
-
-  - type: grid
-    cards:
-      - type: heading
-        heading: Kontor
-
-      - type: horizontal-stack
-        cards:
-          - type: custom:apexcharts-card
-            graph_span: 24h
-            header:
-              show: true
-              title: Temperaturer
-              show_states: true
-              colorize_states: true
-            now:
-              show: true
-              label: Nu
-            apex_config:
-              chart:
-                height: 240
-              grid:
-                strokeDashArray: 2
-              xaxis:
-                type: datetime
-                labels:
-                  datetimeFormatter:
-                    hour: HH:mm
-              yaxis:
-                decimalsInFloat: 1
-                tickAmount: 6
-            series:
-              - entity: sensor.kontor_motion_temperatur
-                name: Hue
-
-          - type: vertical-stack
-            cards:
-              - type: thermostat
-                entity: climate.kontor
-                name: Gulvvarme
-
-              - type: grid
-                columns: 2
-                square: false
-                cards:
-                  - type: custom:button-card
-                    entity: climate.kontor
-                    name: -0.5°
-                    icon: mdi:minus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.kontor
-                        temperature: '[[[ return Math.max(7, (entity.attributes.temperature || 0) - 0.5); ]]]'
-
-                  - type: custom:button-card
-                    entity: climate.kontor
-                    name: +0.5°
-                    icon: mdi:plus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.kontor
-                        temperature: '[[[ return Math.min(35, (entity.attributes.temperature || 0) + 0.5); ]]]'
-
-  - type: grid
-    cards:
-      - type: heading
-        heading: Stue
-
       - type: custom:apexcharts-card
         graph_span: 24h
         header:
           show: true
-          title: Temperaturer
+          title: Andreas
+          show_states: true
+          colorize_states: true
+        now:
+          show: true
+          label: Nu
+        apex_config:
+          chart:
+            height: 240
+          grid:
+            strokeDashArray: 2
+          xaxis:
+            type: datetime
+            labels:
+              datetimeFormatter:
+                hour: HH:mm
+          yaxis:
+            decimalsInFloat: 1
+            tickAmount: 6
+        series:
+          - entity: sensor.sovevaerelse_stue_temperatur
+            name: Netatmo
+          - entity: sensor.hue_motion_sensor_2_temperature_2
+            name: Hue
+
+      - type: thermostat
+        entity: climate.andreas
+        name: Andreas
+
+  - type: grid
+    cards:
+      - type: custom:apexcharts-card
+        graph_span: 24h
+        header:
+          show: true
+          title: Daniel
+          show_states: true
+          colorize_states: true
+        now:
+          show: true
+          label: Nu
+        apex_config:
+          chart:
+            height: 240
+          grid:
+            strokeDashArray: 2
+          xaxis:
+            type: datetime
+            labels:
+              datetimeFormatter:
+                hour: HH:mm
+          yaxis:
+            decimalsInFloat: 1
+            tickAmount: 6
+        series:
+          - entity: sensor.sovevaerelse_daniel_temperatur
+            name: Netatmo
+          - entity: sensor.hue_motion_sensor_2_temperature
+            name: Hue
+
+      - type: thermostat
+        entity: climate.daniel
+        name: Daniel
+
+  - type: grid
+    cards:
+      - type: custom:apexcharts-card
+        graph_span: 24h
+        header:
+          show: true
+          title: Sovevaerelse
+          show_states: true
+          colorize_states: true
+        now:
+          show: true
+          label: Nu
+        apex_config:
+          chart:
+            height: 240
+          grid:
+            strokeDashArray: 2
+          xaxis:
+            type: datetime
+            labels:
+              datetimeFormatter:
+                hour: HH:mm
+          yaxis:
+            decimalsInFloat: 1
+            tickAmount: 6
+        series:
+          - entity: sensor.sovevaerelse_temperatur
+            name: Netatmo
+          - entity: sensor.hue_motion_sensor_1_temperature_2
+            name: Hue sovevaerelse
+          - entity: sensor.hue_motion_sensor_1_temperature
+            name: Hue skab
+
+      - type: thermostat
+        entity: climate.sovev_prelse
+        name: Sovevaerelse
+
+  - type: grid
+    cards:
+      - type: custom:apexcharts-card
+        graph_span: 24h
+        header:
+          show: true
+          title: Kontor
+          show_states: true
+          colorize_states: true
+        now:
+          show: true
+          label: Nu
+        apex_config:
+          chart:
+            height: 240
+          grid:
+            strokeDashArray: 2
+          xaxis:
+            type: datetime
+            labels:
+              datetimeFormatter:
+                hour: HH:mm
+          yaxis:
+            decimalsInFloat: 1
+            tickAmount: 6
+        series:
+          - entity: sensor.kontor_motion_temperatur
+            name: Hue
+
+      - type: thermostat
+        entity: climate.kontor
+        name: Kontor
+
+  - type: grid
+    cards:
+      - type: custom:apexcharts-card
+        graph_span: 24h
+        header:
+          show: true
+          title: Gang
+          show_states: true
+          colorize_states: true
+        now:
+          show: true
+          label: Nu
+        apex_config:
+          chart:
+            height: 240
+          grid:
+            strokeDashArray: 2
+          xaxis:
+            type: datetime
+            labels:
+              datetimeFormatter:
+                hour: HH:mm
+          yaxis:
+            decimalsInFloat: 1
+            tickAmount: 6
+        series:
+          - entity: sensor.gang_sensor_temperature
+            name: Hue
+
+      - type: thermostat
+        entity: climate.fordelingsgang
+        name: Gang
+
+  - type: grid
+    cards:
+      - type: custom:apexcharts-card
+        graph_span: 24h
+        header:
+          show: true
+          title: Bad
+          show_states: true
+          colorize_states: true
+        now:
+          show: true
+          label: Nu
+        apex_config:
+          chart:
+            height: 240
+          grid:
+            strokeDashArray: 2
+          xaxis:
+            type: datetime
+            labels:
+              datetimeFormatter:
+                hour: HH:mm
+          yaxis:
+            decimalsInFloat: 1
+            tickAmount: 6
+        series:
+          - entity: sensor.bad_motion_sensor_temperature
+            name: Hue
+
+  - type: grid
+    cards:
+      - type: custom:apexcharts-card
+        graph_span: 24h
+        header:
+          show: true
+          title: Stue
           show_states: true
           colorize_states: true
         now:
@@ -245,84 +242,11 @@ sections:
 
   - type: grid
     cards:
-      - type: heading
-        heading: Sovevaerelse
-
-      - type: horizontal-stack
-        cards:
-          - type: custom:apexcharts-card
-            graph_span: 24h
-            header:
-              show: true
-              title: Temperaturer
-              show_states: true
-              colorize_states: true
-            now:
-              show: true
-              label: Nu
-            apex_config:
-              chart:
-                height: 240
-              grid:
-                strokeDashArray: 2
-              xaxis:
-                type: datetime
-                labels:
-                  datetimeFormatter:
-                    hour: HH:mm
-              yaxis:
-                decimalsInFloat: 1
-                tickAmount: 6
-            series:
-              - entity: sensor.sovevaerelse_temperatur
-                name: Netatmo
-              - entity: sensor.hue_motion_sensor_1_temperature_2
-                name: Hue sovevaerelse
-              - entity: sensor.hue_motion_sensor_1_temperature
-                name: Hue skab
-
-          - type: vertical-stack
-            cards:
-              - type: thermostat
-                entity: climate.sovev_prelse
-                name: Gulvvarme
-
-              - type: grid
-                columns: 2
-                square: false
-                cards:
-                  - type: custom:button-card
-                    entity: climate.sovev_prelse
-                    name: -0.5°
-                    icon: mdi:minus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.sovev_prelse
-                        temperature: '[[[ return Math.max(7, (entity.attributes.temperature || 0) - 0.5); ]]]'
-
-                  - type: custom:button-card
-                    entity: climate.sovev_prelse
-                    name: +0.5°
-                    icon: mdi:plus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.sovev_prelse
-                        temperature: '[[[ return Math.min(35, (entity.attributes.temperature || 0) + 0.5); ]]]'
-
-  - type: grid
-    cards:
-      - type: heading
-        heading: Bad
-
       - type: custom:apexcharts-card
         graph_span: 24h
         header:
           show: true
-          title: Temperaturer
+          title: Forgang
           show_states: true
           colorize_states: true
         now:
@@ -342,73 +266,15 @@ sections:
             decimalsInFloat: 1
             tickAmount: 6
         series:
-          - entity: sensor.bad_motion_sensor_temperature
+          - entity: sensor.forgang_sensor_temperature
             name: Hue
 
+      - type: thermostat
+        entity: climate.forgang
+        name: Forgang
+
   - type: grid
     cards:
-      - type: heading
-        heading: Gang
-
-      - type: horizontal-stack
-        cards:
-          - type: custom:apexcharts-card
-            graph_span: 24h
-            header:
-              show: true
-              title: Temperaturer
-              show_states: true
-              colorize_states: true
-            now:
-              show: true
-              label: Nu
-            apex_config:
-              chart:
-                height: 240
-              grid:
-                strokeDashArray: 2
-              xaxis:
-                type: datetime
-                labels:
-                  datetimeFormatter:
-                    hour: HH:mm
-              yaxis:
-                decimalsInFloat: 1
-                tickAmount: 6
-            series:
-              - entity: sensor.gang_sensor_temperature
-                name: Gang
-              - entity: sensor.forgang_sensor_temperature
-                name: Forgang
-
-          - type: vertical-stack
-            cards:
-              - type: thermostat
-                entity: climate.fordelingsgang
-                name: Gulvvarme
-
-              - type: grid
-                columns: 2
-                square: false
-                cards:
-                  - type: custom:button-card
-                    entity: climate.fordelingsgang
-                    name: -0.5°
-                    icon: mdi:minus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.fordelingsgang
-                        temperature: '[[[ return Math.max(7, (entity.attributes.temperature || 0) - 0.5); ]]]'
-
-                  - type: custom:button-card
-                    entity: climate.fordelingsgang
-                    name: +0.5°
-                    icon: mdi:plus
-                    tap_action:
-                      action: call-service
-                      service: climate.set_temperature
-                      service_data:
-                        entity_id: climate.fordelingsgang
-                        temperature: '[[[ return Math.min(35, (entity.attributes.temperature || 0) + 0.5); ]]]'
\ No newline at end of file
+      - type: thermostat
+        entity: climate.lille_bad
+        name: Lille bad
\ No newline at end of file