diff --git a/lovelace/floorplan.yaml b/lovelace/floorplan.yaml
index 3faebf5..5165153 100644
--- a/lovelace/floorplan.yaml
+++ b/lovelace/floorplan.yaml
@@ -4,99 +4,65 @@ cards:
     image: !file /local/images/Bottenvåning.png
     elements:
 
-      {% set lamp = """
+      {% macro lamp(entity, x, y) -%}
+      - entity: {{entity}}
+        style: { left: {{x}}%, top: {{y}}% }
         type: state-icon
         tap_action: { action: toggle }
-        """ %}
-      {% set dimlamp = """
+      {%- endmacro %}
+      {% macro dimlamp(entity, x, y) -%}
+      - entity: {{entity}}
+        style: { left: {{x}}%, top: {{y}}% }
         type: state-icon
         tap_action: { action: toggle }
         hold_action: { action: more-info }
-        """ %}
+      {%- endmacro %}
 
       # Kontoret
-      - entity: light.taklampa_kontoret
-        style: { left: 82%, top: 68% }
-        {{ dimlamp }}
-      - entity: light.kontor_fonster
-        style: { left: 83%, top: 87% }
-        {{ lamp }}
-      - entity: light.skrivbordslampa_1
-        style: { left: 88%, top: 58% }
-        {{ dimlamp }}
+      {{ dimlamp('light.taklampa_kontoret', 82, 68) }}
+      {{ lamp('light.kontor_fonster', 83, 87) }}
+      {{ dimlamp('light.skrivbordslampa_1', 88, 58) }}
 
       # Lilla hallen
-      - entity: light.lilla_hallen
-        style: { left: 72%, top: 53% }
-        {{ dimlamp }}
+      {{ dimlamp('light.lilla_hallen', 72, 53) }}
 
       # Stora hallen
-      - entity: light.stora_hallen
-        style: { left: 43%, top: 70% }
-        {{ dimlamp }}
-      - entity: light.trappbelysning
-        style: { left: 49%, top: 61% }
-        {{ lamp }}
+      {{ dimlamp('light.stora_hallen', 43, 70) }}
+      {{ lamp('light.trappbelysning', 49, 61) }}
 
      # Köket
-      - entity: light.taklampa_koket
-        style: { left: 32%, top: 76% }
-        {{ dimlamp }}
+      {{ dimlamp('light.taklampa_koket', 32, 76) }}
       - type: state-icon
         entity: switch.kaffebryggare
         tap_action: { action: toggle }
         style: { left: 16%, top: 84% }
 
     # Vardagsrummet
-      - entity: light.vardagsrum
-        style: { left: 60%, top: 30% }
-        {{ dimlamp }}
-      - entity: light.takflakt
-        style: { left: 43%, top: 30% }
-        {{ dimlamp }}
-      - entity: light.bokhylla
-        style: { left: 55%, top: 45% }
-        {{ lamp }}
-      - entity: light.deko_vardagsrum
-        style: { left: 49%, top: 15% }
-        {{ lamp }}
+      {{ dimlamp('light.vardagsrum', 60, 30) }}
+      {{ dimlamp('light.takflakt', 43, 30) }}
+      {{ lamp('light.bokhylla', 55, 45) }}
+      {{ lamp('light.deko_vardagsrum', 49, 15) }}
       - type: state-label
         entity: sensor.vardagsrum_0
         style: { left: 40%, top: 36% }
 
     # Sovrum
-      - entity: light.sovrum
-        style: { left: 81%, top: 30% }
-        {{ dimlamp }}
+      {{ dimlamp('light.sovrum', 81, 30) }}
 
     # Tvättstuga
-      - entity: light.skotbord
-        style: { left: 21%, top: 15% }
-        {{ lamp }}
+      {{ lamp('light.skotbord', 21, 15) }}
 
     # Utomhus
-      - entity: light.ute_framsidan
-        style: { left: 44%, top: 94% }
-        {{ lamp }}
-      - entity: light.ute_framsidan
-        style: { left: 16%, top: 94% }
-        {{ lamp }}
-      - entity: light.ute_framsidan
-        style: { left: 60%, top: 94% }
-        {{ lamp }}
-      - entity: light.ute_framsidan
-        style: { left: 75%, top: 94% }
-        {{ lamp }}
-      - entity: light.ute_framsidan
-        style: { left: 95%, top: 30% }
-        {{ lamp }}
-      - entity: light.ute_framsidan
-        style: { left: 95%, top: 70% }
-        {{ lamp }}
-
+      {{ lamp('light.ute_framsidan', 44, 94) }}
+      {{ lamp('light.ute_framsidan', 16, 94) }}
+      {{ lamp('light.ute_framsidan', 60, 94) }}
+      {{ lamp('light.ute_framsidan', 75, 94) }}
+      {{ lamp('light.ute_framsidan', 95, 30) }}
+      {{ lamp('light.ute_framsidan', 95, 70) }}
       - type: state-label
         entity: sensor.elmatare_0
         style: { left: 5%, top: 55% }
+
   - type: custom:popup-card
     entity: light.takflakt
     title: Takfläkt
diff --git a/lovelace/main.yaml b/lovelace/main.yaml
index 29ec69e..91d5271 100644
--- a/lovelace/main.yaml
+++ b/lovelace/main.yaml
@@ -1,22 +1,13 @@
-{% set dev_card="- !include dev_card.yaml" %}
-
 title: Åvägen
 resources: !include resources.yaml
 views:
-  - title: Hemma
-    cards:
-      {{ dev_card }}
-      - !include floorplan.yaml
-      - !include coffee_card.yaml
-      - !include cameras/barnrum.yaml
-      - !include cameras/kontor.yaml
-      - !include temperatures_card.yaml
-
+  - !include views/diverse_view.yaml
   - title: Floorplan
     panel: true
+    icon: mdi:floor-plan
     cards:
       - type: vertical-stack
         cards:
-        {{ dev_card }}
+        - !include dev_card.yaml
         - !include floorplan.yaml
   - !include views/dev_view.yaml
diff --git a/lovelace/power_card.yaml b/lovelace/power_card.yaml
new file mode 100644
index 0000000..e89e170
--- /dev/null
+++ b/lovelace/power_card.yaml
@@ -0,0 +1,17 @@
+type: entities
+show_header_toggle: false
+title: Elförbrukning
+entities:
+  - type: section
+    label: Senaste dygnet
+  - type: custom:hui-history-graph-card
+    hours_to_show: 24
+    entities:
+      - sensor.filtered_power
+  - type: section
+    label: Senaste veckan
+  - type: custom:hui-history-graph-card
+    hours_to_show: 168
+    entities:
+      - sensor.filtered_power
+      - sensor.power_meter
diff --git a/lovelace/views/diverse_view.yaml b/lovelace/views/diverse_view.yaml
new file mode 100644
index 0000000..48a49b7
--- /dev/null
+++ b/lovelace/views/diverse_view.yaml
@@ -0,0 +1,9 @@
+title: Diverse
+icon: mdi:home-assistant
+cards:
+  - !include floorplan.yaml
+  - !include coffee_card.yaml
+  - !include cameras/barnrum.yaml
+  - !include cameras/kontor.yaml
+  - !include temperatures_card.yaml
+  - !include power_card.yaml
diff --git a/packages/mysensors.yaml b/packages/mysensors.yaml
index 5e60ff8..4a46658 100644
--- a/packages/mysensors.yaml
+++ b/packages/mysensors.yaml
@@ -41,3 +41,8 @@ sensor:
       power_meter:
         value_template: "{{ states.sensor.elmatare_20.attributes.V_WATT }}"
         unit_of_measurement: 'W'
+  - platform: filter
+    name: "Filtered power"
+    entity_id: sensor.power_meter
+    filters:
+      - filter: lowpass