diff --git a/lovelace/dashboard/hello_world.yaml b/lovelace/dashboard/hello_world.yaml
index 32e35fb..dffadb2 100755
--- a/lovelace/dashboard/hello_world.yaml
+++ b/lovelace/dashboard/hello_world.yaml
@@ -8,7 +8,7 @@
     entity_1:
       entity_id: light.living_room_lights
       icon: "mdi:lightbulb" #OPTIONAL
-      name: Living Room
+      name: LivingRoom
       color: "blue"
       
 - type: custom:weather-card
diff --git a/lovelace/dashboard/lights.yaml b/lovelace/dashboard/lights.yaml
index 208d299..19299c7 100755
--- a/lovelace/dashboard/lights.yaml
+++ b/lovelace/dashboard/lights.yaml
@@ -71,3 +71,16 @@
     ulm_card_light_enable_color: true
     ulm_card_light_force_background_color: true
     ulm_card_light_name: TV
+
+- type: 'custom:button-card'
+  template: card_title
+  name: Hallway
+  label: Light
+
+- type: "custom:button-card"
+  template: card_light
+  entity: light.hallway_switch_lamp
+  variables:
+    ulm_card_light_enable_color: true
+    ulm_card_light_force_background_color: true
+    ulm_card_light_name: Hallway
\ No newline at end of file
diff --git a/lovelace/dashboard/sensors.yaml b/lovelace/dashboard/sensors.yaml
new file mode 100755
index 0000000..6189517
--- /dev/null
+++ b/lovelace/dashboard/sensors.yaml
@@ -0,0 +1,71 @@
+- type: 'custom:button-card'
+  template: card_title
+  name: ZigBee
+  label: Sensors
+- type: 'custom:button-card'
+  template: card_binary_sensor_alert
+  variables:
+    ulm_card_binary_sensor_alert: true
+    ulm_show_last_changed: true
+    ulm_card_binary_sensor_alert_name : "Garden Door"
+  entity: binary_sensor.livingroom_door_garden_iaszone
+- type: 'custom:button-card'
+  template: card_binary_sensor_alert
+  variables:
+    ulm_card_binary_sensor_alert: true
+    ulm_show_last_changed: true
+    ulm_card_binary_sensor_alert_name : "Freezer"
+  entity: binary_sensor.livingroom_freezer_iaszone
+- type: 'custom:button-card'
+  template: card_binary_sensor_alert
+  variables:
+    ulm_card_binary_sensor_alert: true
+    ulm_show_last_changed: true
+    ulm_card_binary_sensor_alert_name : "Bathroom Window"
+  entity: binary_sensor.bathroom_window_iaszone
+- type: 'custom:button-card'
+  template: card_binary_sensor_alert
+  variables:
+    ulm_card_binary_sensor_alert: true
+    ulm_show_last_changed: true
+    ulm_card_binary_sensor_alert_name : "Mailbox"
+  entity: binary_sensor.mailbox_door_iaszone
+- type: 'custom:button-card'
+  template: card_binary_sensor_alert
+  variables:
+    ulm_card_binary_sensor_alert: true
+    ulm_show_last_changed: true
+    ulm_card_binary_sensor_alert_name : "Hallway Motion"
+  entity: binary_sensor.hallway_motion_iaszone
+- type: 'custom:button-card'
+  template: card_binary_sensor_alert
+  variables:
+    ulm_card_binary_sensor_alert: true
+    ulm_show_last_changed: true
+    ulm_card_binary_sensor_alert_name : "Mailbox Motion"
+  entity: binary_sensor.mailbox_motion_iaszone
+- type: 'custom:button-card'
+  template: card_graph
+  entity: sensor.livingroom_temp_temperature
+  variables:
+    ulm_card_graph_color: "var(--google-blue)"
+    ulm_card_graph_name: Temperature Livingroom
+    ulm_card_graph_entity: sensor.livingroom_temp_temperature
+    ulm_card_graph_color2: "var(--google-green)"
+    ulm_card_graph_entity2: sensor.livingroom_temp_temperature
+    ulm_card_graph_type: fill
+    ulm_card_graph_hours: 24
+- type: 'custom:button-card'
+  template: card_graph
+  entity: sensor.livingroom_temp_humidity
+  variables:
+    ulm_card_graph_color: "var(--google-blue)"
+    ulm_card_graph_name: Temperature Livingroom
+    ulm_card_graph_entity: sensor.livingroom_temp_humidity
+    ulm_card_graph_color2: "var(--google-green)"
+    ulm_card_graph_entity2: sensor.livingroom_temp_humidity
+    ulm_card_graph_type: fill
+    ulm_card_graph_hours: 24
+
+
+
diff --git a/packages/light/adaptive.yaml b/packages/light/adaptive.yaml
index a8d3aa6..f12c027 100755
--- a/packages/light/adaptive.yaml
+++ b/packages/light/adaptive.yaml
@@ -1,4 +1,5 @@
 adaptive_lighting:
   min_brightness: 35
   lights:
-    - light.office_bulb
\ No newline at end of file
+    - light.office_bulb
+    - light.bedroom_bulb_light
\ No newline at end of file
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 6e057ee..6881d34 100755
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -20,4 +20,8 @@ views:
         type: vertical-stack
         cards:
           !include lovelace/dashboard/lights.yaml
-      
\ No newline at end of file
+      - type: custom:layout-break
+      - type: custom:vertical-layout
+        type: vertical-stack  
+        cards:
+          !include lovelace/dashboard/sensors.yaml
\ No newline at end of file