diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index 196e603..78d100f 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -310,6 +310,39 @@ streamline_templates:
         - state_color_button
       state_color_button:
         color: '[[color]]'
+  contact_sensor_button:
+    defaults:
+      - name: ''
+      - columns: 2
+      - show_state: true
+    card:
+      type: custom:bubble-card
+      card_type: button
+      button_type: state
+      entity: '[[entity]]'
+      name: '[[name]]'
+      show_state: '[[show_state]]'
+      tap_action:
+        action: more-info
+      double_tap_action:
+        action: none
+      hold_action:
+        action: none
+      button_action:
+        double_tap_action:
+          action: none
+        hold_action:
+          action: none
+      columns: '[[columns]]'
+      modules:
+        - default
+        - state_color_button
+        - get_state_attribute
+      state_color_button:
+        color: '[[color]]'
+      get_state_attribute:
+        - entity: '[[entity]]'
+        - entity: '[[entity]]_tamper'
   phone_info_grid:
     card:
       type: custom:stack-in-card
@@ -1774,9 +1807,9 @@ views:
                   - type: custom:streamline-card
                     template: popup_temperature_button
                     variables:
-                      - name: Front Temp
-                      - entity: sensor.living_room_front_temperature
-                      - hot_entity: binary_sensor.living_room_hot
+                      name: Front Temp
+                      entity: sensor.living_room_front_temperature
+                      hot_entity: binary_sensor.living_room_hot
                   - type: custom:bubble-card
                     card_type: button
                     button_type: state
@@ -1788,9 +1821,9 @@ views:
                   - type: custom:streamline-card
                     template: popup_temperature_button
                     variables:
-                      - name: Back Temp
-                      - entity: sensor.living_room_back_temperature
-                      - hot_entity: binary_sensor.living_room_back_hot
+                      name: Back Temp
+                      entity: sensor.living_room_back_temperature
+                      hot_entity: binary_sensor.living_room_back_hot
                   - type: custom:bubble-card
                     card_type: button
                     button_type: state
@@ -1802,26 +1835,26 @@ views:
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
-                      - name: Front Motion
-                      - entity: binary_sensor.living_room_front_motion
-                      - color: accent-color
+                      name: Front Motion
+                      entity: binary_sensor.living_room_front_motion
+                      color: accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
-                      - name: Back Motion
-                      - entity: binary_sensor.living_room_back_motion
-                      - color: accent-color
+                      name: Back Motion
+                      entity: binary_sensor.living_room_back_motion
+                      color: accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
-                      - name: Occupied
-                      - entity: binary_sensor.living_room_occupied
-                      - color: accent-color
+                      name: Occupied
+                      entity: binary_sensor.living_room_occupied
+                      color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
-                  - name: Lights Timer
-                  - entity: timer.living_room_motion_timer
+                  name: Lights Timer
+                  entity: timer.living_room_motion_timer
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -1829,11 +1862,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Door
-                      - entity: binary_sensor.front_door
-                      - color: error-color
+                      name: Door
+                      entity: binary_sensor.front_door
+                      color: error-color
                   - type: custom:bubble-card
                     card_type: empty-column
                   - type: custom:bubble-card
@@ -1841,63 +1874,63 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Front 1
-                      - entity: binary_sensor.front_window_1
-                      - color: error-color
+                      name: Front 1
+                      entity: binary_sensor.front_window_1
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Front 2
-                      - entity: binary_sensor.front_window_2
-                      - color: error-color
+                      name: Front 2
+                      entity: binary_sensor.front_window_2
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Front 3
-                      - entity: binary_sensor.front_window_3
-                      - color: error-color
+                      name: Front 3
+                      entity: binary_sensor.front_window_3
+                      color: error-color
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Side 1
-                      - entity: binary_sensor.side_window_1
-                      - color: error-color
+                      name: Side 1
+                      entity: binary_sensor.side_window_1
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Side 2
-                      - entity: binary_sensor.side_window_2
-                      - color: error-color
+                      name: Side 2
+                      entity: binary_sensor.side_window_2
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Side 3
-                      - entity: binary_sensor.side_window_3
-                      - color: error-color
+                      name: Side 3
+                      entity: binary_sensor.side_window_3
+                      color: error-color
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Side 4
-                      - entity: binary_sensor.side_window_4
-                      - color: error-color
+                      name: Side 4
+                      entity: binary_sensor.side_window_4
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Back 1
-                      - entity: binary_sensor.back_window_1
-                      - color: error-color
+                      name: Back 1
+                      entity: binary_sensor.back_window_1
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Back 2
-                      - entity: binary_sensor.back_window_2
-                      - color: error-color
+                      name: Back 2
+                      entity: binary_sensor.back_window_2
+                      color: error-color
           - type: vertical-stack
             cards:
               - type: custom:bubble-card
@@ -1988,17 +2021,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Back
-                      - entity: binary_sensor.downstairs_bathroom_window_1
-                      - color: error-color
+                      name: Back
+                      entity: binary_sensor.downstairs_bathroom_window_1
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Side
-                      - entity: binary_sensor.downstairs_bathroom_window_2
-                      - color: error-color
+                      name: Side
+                      entity: binary_sensor.downstairs_bathroom_window_2
+                      color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2084,17 +2117,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Big Window
-                      - entity: binary_sensor.kitchen_big_window
-                      - color: error-color
+                      name: Big Window
+                      entity: binary_sensor.kitchen_big_window
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Sink Window
-                      - entity: binary_sensor.kitchen_sink_window
-                      - color: error-color
+                      name: Sink Window
+                      entity: binary_sensor.kitchen_sink_window
+                      color: error-color
           - type: vertical-stack
             cards:
               - type: custom:bubble-card
@@ -2175,17 +2208,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Back Door
-                      - entity: binary_sensor.back_door
-                      - color: error-color
+                      name: Back Door
+                      entity: binary_sensor.back_door
+                      color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Window
-                      - entity: binary_sensor.mud_room_window
-                      - color: error-color
+                      name: Window
+                      entity: binary_sensor.mud_room_window
+                      color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2268,11 +2301,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
-                      - name: Window
-                      - entity: binary_sensor.stairway_window_lower
-                      - color: error-color
+                      name: Window
+                      entity: binary_sensor.stairway_window_lower
+                      color: error-color
                   - type: custom:bubble-card
                     card_type: empty-column
               - type: custom:streamline-card
@@ -3199,13 +3232,13 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Front
                       - entity: binary_sensor.front_door
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Back
                       - entity: binary_sensor.back_door
@@ -3217,19 +3250,19 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Front 1
                       - entity: binary_sensor.front_window_1
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Front 2
                       - entity: binary_sensor.front_window_2
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Front 3
                       - entity: binary_sensor.front_window_3
@@ -3237,19 +3270,19 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Side 1
                       - entity: binary_sensor.side_window_1
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Side 2
                       - entity: binary_sensor.side_window_2
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Side 3
                       - entity: binary_sensor.side_window_3
@@ -3257,19 +3290,19 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Side 4
                       - entity: binary_sensor.side_window_4
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Back 1
                       - entity: binary_sensor.back_window_1
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Back 2
                       - entity: binary_sensor.back_window_2
@@ -3281,7 +3314,7 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.stairway_window_lower
@@ -3295,13 +3328,13 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Big
                       - entity: binary_sensor.kitchen_big_window
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Sink
                       - entity: binary_sensor.kitchen_sink_window
@@ -3313,7 +3346,7 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.mud_room_window
@@ -3327,13 +3360,13 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Back
                       - entity: binary_sensor.downstairs_bathroom_window_1
                       - color: error-color
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Side
                       - entity: binary_sensor.downstairs_bathroom_window_2
@@ -3345,7 +3378,7 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.stairway_window_upper
@@ -3359,7 +3392,7 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: state_color_button
+                    template: contact_sensor_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.upstairs_bathroom_window
@@ -4367,7 +4400,6 @@ views:
     header:
       card:
         type: markdown
-        text_only: true
         content: >-
           {% from 'weather.jinja' import weatherReport %} {% from
           'formatting.jinja' import cleanup %} {% import 'status.jinja' as
@@ -6437,6 +6469,13 @@ views:
               navigation_path: '#security'
               color: error-color
               columns: '2'
+          - type: custom:streamline-card
+            template: contact_sensor_button
+            variables:
+              entity: binary_sensor.side_window_1
+              name: Contact Sensor Button
+              color: error-color
+              columns: '2'
       - type: grid
         cards:
           - type: heading
@@ -6638,6 +6677,33 @@ views:
               - state_color_button
             state_color_button:
               color: error-color
+          - type: custom:bubble-card
+            card_type: button
+            button_type: state
+            entity: binary_sensor.side_window_1
+            name: Contact Sensor Button
+            show_state: true
+            tap_action:
+              action: more-info
+            double_tap_action:
+              action: none
+            hold_action:
+              action: none
+            button_action:
+              double_tap_action:
+                action: none
+              hold_action:
+                action: none
+            columns: 2
+            modules:
+              - default
+              - state_color_button
+              - get_state_attribute
+            state_color_button:
+              color: error-color
+            get_state_attribute:
+              - entity: binary_sensor.side_window_1
+              - entity: binary_sensor.side_window_1_tamper
       - type: grid
         cards:
           - type: heading