diff --git a/config/lovelace/button_card_templates/mixins/with_state_background_button.yaml b/config/lovelace/button_card_templates/mixins/with_state_background_button.yaml
index 8dd376d..086c5b5 100644
--- a/config/lovelace/button_card_templates/mixins/with_state_background_button.yaml
+++ b/config/lovelace/button_card_templates/mixins/with_state_background_button.yaml
@@ -14,3 +14,10 @@ with_state_background:
           - color: black
         icon:
           - color: black
+    - value: 'recording'
+      styles:
+        card:
+          - background-color: var(--primary-color)
+          - color: black
+        icon:
+          - color: black
diff --git a/config/lovelace/home_dashboard/bedroom_dashboard.yaml b/config/lovelace/home_dashboard/bedroom_dashboard.yaml
index bad9418..147040b 100644
--- a/config/lovelace/home_dashboard/bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/bedroom_dashboard.yaml
@@ -147,6 +147,14 @@
               - player: media_player.master_bedroom
               - player_name: Bedroom
 
+          - type: vertical-stack
+            title: Camera
+            cards:
+              - type: picture-glance
+                camera_image: camera.mercury_bedroom
+                entities: []
+
+
       - type: vertical-stack
         title: Sensors
         cards:
diff --git a/config/lovelace/home_dashboard/cameras_dashboard.yaml b/config/lovelace/home_dashboard/cameras_dashboard.yaml
new file mode 100644
index 0000000..adeb996
--- /dev/null
+++ b/config/lovelace/home_dashboard/cameras_dashboard.yaml
@@ -0,0 +1,29 @@
+- type: custom:mod-card
+  style:
+    layout-card:
+      $:
+        .: |
+          #columns {
+            padding: 0 10px;
+          }
+          #columns .column {
+            padding: 0 10px;
+          }
+  card:
+    type: custom:layout-card
+    layout: horizontal
+    max_columns: 2
+    cards:
+      - type: vertical-stack
+        title: Living Room
+        cards:
+          - type: picture-glance
+            camera_image: camera.mercury_amcrest_1
+            entities: []
+
+      - type: vertical-stack
+        title: Bedroom
+        cards:
+          - type: picture-glance
+            camera_image: camera.mercury_bedroom
+            entities: []
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index 20f0b49..c4d5cc6 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -128,8 +128,7 @@
             cards:
               - type: picture-glance
                 camera_image: camera.mercury_amcrest_1
-                entities:
-                  - entity: camera.mercury_amcrest_1
+                entities: []
 
 
       - type: vertical-stack
diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml
index a408f73..34717f4 100644
--- a/config/lovelace/home_dashboard/main_dashboard.yaml
+++ b/config/lovelace/home_dashboard/main_dashboard.yaml
@@ -146,8 +146,12 @@
                 cards:
                   - type: custom:button-card
                     template: default
-                    entity: binary_sensor.camera_state
-                    name: Camera
+                    entity: camera.mercury_amcrest_1
+                    name: Living Room
+                  - type: custom:button-card
+                    template: default
+                    entity: camera.mercury_bedroom
+                    name: Bedroom
                   - type: custom:button-card
                     template: [default, with_state_indicator]
                     entity: fan.philips_airpurifier
diff --git a/config/ui-lovelace.yaml b/config/ui-lovelace.yaml
index e22d6c8..b5b795f 100644
--- a/config/ui-lovelace.yaml
+++ b/config/ui-lovelace.yaml
@@ -39,3 +39,8 @@ views:
     icon: "mdi:robot-vacuum"
     panel: true
     cards: !include lovelace/home_dashboard/vacuum_dashboard.yaml
+  - title: Cameras
+    path: cameras
+    icon: "mdi:webcam"
+    panel: true
+    cards: !include lovelace/home_dashboard/cameras_dashboard.yaml