diff --git a/motion_activated_scene.yaml b/motion_activated_scene.yaml
index b433d76..e332ee9 100644
--- a/motion_activated_scene.yaml
+++ b/motion_activated_scene.yaml
@@ -5,7 +5,7 @@ blueprint:
   author: Florian Klemenz
   input:
     motion_sensors:
-      name: Motion Sensor
+      name: Motion/Presence/Occupancy Sensors
       selector:
         entity:
           multiple: true
@@ -26,7 +26,7 @@ blueprint:
           max: 300
           unit_of_measurement: seconds
     illuminance_sensors:
-      name: Illuminance sensor
+      name: Illuminance sensors
       description: The illuminance sensor to get lux data.
       selector:
         entity:
@@ -43,33 +43,39 @@ blueprint:
           min: 0
           max: 100
           unit_of_measurement: lx
-    daytime_trigger:
-      name: Daytime
-      description: Binary sensor (TimeOfDay) or schedule to indicate when it is daytime
-      selector:
-        entity:
-          filter:
-            - integration: tod
-              domain: binary_sensor
-            - domain: schedule
-    daytime_scene:
-      name: Daytime scene
-      selector:
-        entity:
-          filter:
-            domain: scene
-    nighttime_scene:
-      name: Nighttime scene
-      selector:
-        entity:
-          filter:
-            domain: scene
-    off_scene:
-      name: Off scene
-      selector:
-        entity:
-          filter:
-            domain: scene
+
+
+    feature_section:
+      name: "Scene configuration"
+      icon: mdi:window-shutter-cog
+      collapsed: true
+      daytime_trigger:
+        name: Daytime
+        description: Binary sensor (TimeOfDay) or schedule to indicate when it is daytime
+        selector:
+          entity:
+            filter:
+              - integration: tod
+                domain: binary_sensor
+              - domain: schedule
+      daytime_scene:
+        name: Daytime scene
+        selector:
+          entity:
+            filter:
+              domain: scene
+      nighttime_scene:
+        name: Nighttime scene
+        selector:
+          entity:
+            filter:
+              domain: scene
+      off_scene:
+        name: Off scene
+        selector:
+          entity:
+            filter:
+              domain: scene
 
 # If motion is detected within the delay,
 # we restart the script.