diff --git a/dashboards/views/security.yaml b/dashboards/views/security.yaml
index be7245c1..2796874c 100644
--- a/dashboards/views/security.yaml
+++ b/dashboards/views/security.yaml
@@ -27,7 +27,7 @@
             action_name: "Clear current activity"
 
 - type: "vertical-stack"
-  title: "Armed session"
+  title: "Last arming"
   cards:
     - type: "markdown"
       content: |
@@ -90,29 +90,42 @@
           {% endfor %}
 
 - type: "vertical-stack"
-  title: "Dangers"
+  title: "Devices"
   cards:
     - type: entities
       title: Leaks
       entities:
-        - "binary_sensor.kitchen_sink_leak"
-        - "binary_sensor.washing_machine_leak"
-        - "binary_sensor.water_heater_leak"
+        - entity: binary_sensor.kitchen_sink_leak
+          name: Kitchen
+        - entity: binary_sensor.washing_machine_leak
+          name: Washing machine
+        - entity: binary_sensor.water_heater_leak
+          name: Water heater
 
     - type: "entities"
       title: Living room smoke/CO detector
       entities:
-        - sensor.living_room_smoke_co_detector_battery
-        - sensor.living_room_smoke_co_detector_last_seen
-        - binary_sensor.living_room_smoke_co_detector_carbon_monoxide_detected
-        - binary_sensor.living_room_smoke_co_detector_smoke_detected
-        - binary_sensor.living_room_smoke_co_detector_replacement_required_end_of_life
+        - entity: sensor.living_room_smoke_co_detector_battery
+          name: Battery
+        - entity: sensor.living_room_smoke_co_detector_last_seen
+          name: Last seen
+        - entity: binary_sensor.living_room_smoke_co_detector_carbon_monoxide_detected
+          name: Carbon monoxide detected
+        - entity: binary_sensor.living_room_smoke_co_detector_smoke_detected
+          name: Smoke detected
+        - entity: binary_sensor.living_room_smoke_co_detector_replacement_required_end_of_life
+          name: EOL
 
     - type: entities
       title: "Basement smoke/CO detector"
       entities:
-        - sensor.basement_smoke_co_detector_last_seen
-        - sensor.basement_smoke_co_detector_battery
-        - binary_sensor.basement_smoke_co_detector_carbon_monoxide_detected
-        - binary_sensor.basement_smoke_co_detector_smoke_detected
-        - binary_sensor.basement_smoke_co_detector_replacement_required_end_of_life
+        - entity: sensor.basement_smoke_co_detector_battery
+          name: Battery
+        - entity: sensor.basement_smoke_co_detector_last_seen
+          name: Last seen
+        - entity: binary_sensor.basement_smoke_co_detector_carbon_monoxide_detected
+          name: Carbon monoxide detected
+        - entity: binary_sensor.basement_smoke_co_detector_smoke_detected
+          name: Smoke detected
+        - entity: binary_sensor.basement_smoke_co_detector_replacement_required_end_of_life
+          name: EOL