diff --git a/lovelace/00_home.yaml b/lovelace/00_home.yaml
index 956416d..c213e11 100644
--- a/lovelace/00_home.yaml
+++ b/lovelace/00_home.yaml
@@ -10,9 +10,21 @@ cards:
         title: Lights
         show_header_toggle: false
         entities:
-          - entity: light.living_room_all_lights
-          - entity: light.living_room_main_lights
-          - entity: light.pc
+          - type: custom:fold-entity-row
+            head:
+              entity: light.living_room_all_lights
+              name: Living room lights
+            entities:
+              - type: custom:fold-entity-row
+                head:
+                  entity: light.living_room_main_lights
+                  name: Main lights
+                entities:
+                  - light.living_room_1
+                  - light.living_room_2
+                  - light.living_room_3
+                  - light.living_room_4
+              - light.pc
           - entity: light.bedside_light
 
       - type: entities
diff --git a/lovelace/01_living_room.yaml b/lovelace/01_living_room.yaml
index 63aed5e..2b2db60 100644
--- a/lovelace/01_living_room.yaml
+++ b/lovelace/01_living_room.yaml
@@ -10,11 +10,16 @@ cards:
         show_header_toggle: false
         entities:
           - entity: light.living_room_all_lights
-          - entity: light.living_room_main_lights
-          - entity: light.living_room_1
-          - entity: light.living_room_2
-          - entity: light.living_room_3
-          - entity: light.living_room_4
+            name: All Lights
+          - type: custom:fold-entity-row
+            head:
+              entity: light.living_room_main_lights
+              name: Main lights
+            entities:
+              - light.living_room_1
+              - light.living_room_2
+              - light.living_room_3
+              - light.living_room_4
           - entity: light.pc
 
       - type: "custom:mini-media-player"
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 6120434..20721d9 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -1,6 +1,7 @@
 custom_header:
   compact_mode: true
   editor_warnings: false
+  hide_config: true
   hide_help: true
   hide_unused: true
 resources:
@@ -30,6 +31,9 @@ resources:
     url: /hacsfiles/aftership-card/aftership-card.js
   - type: module
     url: /hacsfiles/config-template-card/config-template-card.js
+  - type: module
+    url: /hacsfiles/lovelace-fold-entity-row/fold-entity-row.js
+
 title: Sarah
 views:
   - !include lovelace/00_home.yaml