diff --git a/admin_dashboard.yaml b/admin_dashboard.yaml
index 407f622..f396079 100644
--- a/admin_dashboard.yaml
+++ b/admin_dashboard.yaml
@@ -6,6 +6,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: General
           - type: entities
             title: Briefings
             entities:
@@ -64,9 +66,10 @@ views:
             title: Automations
             state_color: true
             show_header_toggle: false
-        title: General
       - type: grid
         cards:
+          - type: heading
+            heading: Scheduling
           - type: entities
             title: School Stuff
             entities:
@@ -116,9 +119,10 @@ views:
                 - additional-tasks
               icon: action
             time_step: 5
-        title: Scheduling
       - type: grid
         cards:
+          - type: heading
+            heading: Presence
           - type: entities
             entities:
               - entity: group.family
@@ -137,9 +141,10 @@ views:
               - condition: user
                 users:
                   - c3909d27048140729f002aaef0391775
-        title: Presence
       - type: grid
         cards:
+          - type: heading
+            heading: Stats
           - type: custom:auto-entities
             filter:
               include:
@@ -193,9 +198,10 @@ views:
               - condition: user
                 users:
                   - c3909d27048140729f002aaef0391775
-        title: Stats
       - type: grid
         cards:
+          - type: heading
+            heading: Diagnostics
           - type: entities
             entities:
               - entity: script.cleanup_crash
@@ -232,19 +238,20 @@ views:
               - condition: user
                 users:
                   - c3909d27048140729f002aaef0391775
-        title: Diagnostics
       - type: grid
         cards:
+          - type: heading
+            heading: iCloud3
           - type: custom:icloud3-event-log-card
             visibility:
               - condition: user
                 users:
                   - c3909d27048140729f002aaef0391775
-        title: iCloud3
       - type: grid
         cards:
+          - type: heading
+            heading: Browser Mod
           - type: custom:browser-player
-        title: Browser Mod
     max_columns: 4
     cards: []
   - title: Security
@@ -254,6 +261,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Alarm Control Panel
           - type: custom:stack-in-card
             cards:
               - type: tile
@@ -309,9 +318,10 @@ views:
                   - operator: default
                     color: green
                     icon: mdi:shield-check
-        title: Alarm Control Panel
       - type: grid
         cards:
+          - type: heading
+            heading: Security Feed
           - type: custom:home-feed-card
             card_id: security_feed
             show_empty: false
@@ -360,9 +370,10 @@ views:
               - entity: binary_sensor.upstairs_bathroom_window
               - entity: sensor.living_room_windows_open
                 name: Living Room Windows
-        title: Security Feed
       - type: grid
         cards:
+          - type: heading
+            heading: Batteries
           - type: custom:battery-state-card
             sort_by_level: asc
             bulk_rename:
@@ -451,9 +462,10 @@ views:
                 - name: entity_id
                   value: sensor.front_doorbell_battery
             tap_action: more-info
-        title: Batteries
       - type: grid
         cards:
+          - type: heading
+            heading: Sensors
           - type: custom:auto-entities
             card:
               type: entities
@@ -506,9 +518,10 @@ views:
               method: friendly_name
               reverse: false
               ignore_case: true
-        title: Sensors
       - type: grid
         cards:
+          - type: heading
+            heading: Info
           - type: entities
             entities:
               - entity: sensor.living_room_keypad_info
@@ -529,9 +542,10 @@ views:
               - entity: counter.back_door_opened_today
             show_header_toggle: false
             state_color: true
-        title: Info
       - type: grid
         cards:
+          - type: heading
+            heading: Front Doorbell - Settings
           - type: custom:auto-entities
             card:
               type: entities
@@ -553,9 +567,10 @@ views:
               - condition: user
                 users:
                   - c3909d27048140729f002aaef0391775
-        title: Front Doorbell - Settings
       - type: grid
         cards:
+          - type: heading
+            heading: Side Camera - Settings
           - type: custom:auto-entities
             card:
               type: entities
@@ -573,7 +588,6 @@ views:
           - condition: state
             entity: camera.side_camera
             state_not: unavailable
-        title: Side Camera - Settings
     max_columns: 4
     cards: []
   - title: Scheduling
@@ -583,6 +597,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Tony
           - type: entities
             entities:
               - entity: input_datetime.tony_streaming_start_time
@@ -595,9 +611,10 @@ views:
                 name: Stream Scheduling
             show_header_toggle: false
             state_color: true
-        title: Tony
       - type: grid
         cards:
+          - type: heading
+            heading: Tina
           - type: entities
             entities:
               - entity: input_datetime.tina_workday_start
@@ -621,9 +638,10 @@ views:
                 name: Schedule Change
             state_color: true
             show_header_toggle: false
-        title: Tina
       - type: grid
         cards:
+          - type: heading
+            heading: House
           - type: entities
             entities:
               - entity: input_datetime.morning_alarm_disarm
@@ -653,9 +671,10 @@ views:
                 name: Rerun All Evening
             show_header_toggle: false
             state_color: true
-        title: House
       - type: grid
         cards:
+          - type: heading
+            heading: Common
           - type: entities
             entities:
               - entity: input_boolean.two_hour_delay
@@ -673,9 +692,10 @@ views:
             title: School
             show_header_toggle: false
             state_color: true
-        title: Common
       - type: grid
         cards:
+          - type: heading
+            heading: Kallen
           - type: entities
             entities:
               - entity: input_datetime.kallen_wakeup_time
@@ -739,9 +759,10 @@ views:
                 name: Kallen Scheduling Evening
             show_header_toggle: false
             state_color: true
-        title: Kallen
       - type: grid
         cards:
+          - type: heading
+            heading: Master Bedroom
           - type: entities
             entities:
               - entity: input_datetime.master_bedroom_cooling
@@ -762,9 +783,10 @@ views:
                 name: MB Scheduling Evening
             show_header_toggle: false
             state_color: true
-        title: Master Bedroom
       - type: grid
         cards:
+          - type: heading
+            heading: Emma
           - type: entities
             entities:
               - entity: input_datetime.emma_bedroom_cooling
@@ -794,7 +816,6 @@ views:
                 name: Emma Scheduling Evening
             show_header_toggle: false
             state_color: true
-        title: Emma
     max_columns: 4
     cards: []
   - title: Variables
@@ -804,6 +825,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Climate Threshold Sensors
           - type: entities
             entities:
               - entity: input_boolean.meltdown_protocol
@@ -818,9 +841,10 @@ views:
                 name: Overnight Lowest
             show_header_toggle: false
             state_color: true
-        title: Climate Threshold Sensors
       - type: grid
         cards:
+          - type: heading
+            heading: Climate Threshold Settings
           - type: entities
             entities:
               - entity: input_boolean.hot_day
@@ -944,10 +968,11 @@ views:
             show_header_toggle: false
             state_color: true
             title: Weather
-        title: Climate Threshold Settings
         column_span: 1
       - type: grid
         cards:
+          - type: heading
+            heading: Scheduled Modes
           - type: entities
             entities:
               - entity: input_select.scheduled_climate_mode_master_bedroom_aircon
@@ -959,7 +984,6 @@ views:
               - entity: input_boolean.emma_bedroom_climate_override
             show_header_toggle: false
             state_color: true
-        title: Scheduled Modes
     max_columns: 4
     cards: []
     visible:
@@ -975,6 +999,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Tony
           - type: custom:card-templater
             card:
               type: entities
@@ -1082,9 +1108,10 @@ views:
                     name: Ibuprofen Active
                   - entity: input_boolean.tony_tylenol_active
                     name: Tylenol Active
-        title: Tony
       - type: grid
         cards:
+          - type: heading
+            heading: Tina
           - type: entities
             entities:
               - entity: input_boolean.tina_morning_meds_taken
@@ -1113,9 +1140,10 @@ views:
                 name: Night Reminders
             show_header_toggle: false
             state_color: true
-        title: Tina
       - type: grid
         cards:
+          - type: heading
+            heading: Kallen
           - type: entities
             entities:
               - entity: input_boolean.kallen_morning_meds_taken
@@ -1144,9 +1172,10 @@ views:
                 name: Night Reminders
             show_header_toggle: false
             state_color: true
-        title: Kallen
       - type: grid
         cards:
+          - type: heading
+            heading: Emma
           - type: entities
             entities:
               - entity: input_boolean.emma_alternating_meds_active
@@ -1199,7 +1228,6 @@ views:
               - condition: state
                 entity: input_boolean.emma_alternating_meds_active
                 state: 'on'
-        title: Emma
     max_columns: 4
     cards: []
   - title: Pets
@@ -1209,6 +1237,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Rabbit
           - type: entities
             entities:
               - entity: input_boolean.rabbit_fed
@@ -1239,7 +1269,6 @@ views:
                 title: Cleaning
                 show_header_toggle: false
                 state_color: true
-        title: Rabbit
         column_span: 2
     max_columns: 4
     cards: []
@@ -1250,6 +1279,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Lighting Settings
           - type: entities
             entities:
               - entity: input_boolean.adaptive_lighting_adjustments
@@ -1289,7 +1320,6 @@ views:
               - entity: sensor.tina_desk_scene
             show_header_toggle: false
             state_color: true
-        title: Lighting Settings
         column_span: 2
     max_columns: 4
     cards: []
@@ -1300,6 +1330,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Text Notifications
           - type: entities
             entities:
               - entity: input_boolean.text_notifications
@@ -1317,9 +1349,10 @@ views:
                 name: Laundry Notifications
             show_header_toggle: false
             state_color: true
-        title: Text Notifications
       - type: grid
         cards:
+          - type: heading
+            heading: TTS
           - type: entities
             entities:
               - entity: input_boolean.audible_notifications
@@ -1344,9 +1377,10 @@ views:
               - entity: switch.living_room_echo_dot_do_not_disturb_switch
               - entity: switch.master_bedroom_echo_dot_do_not_disturb_switch
             state_color: true
-        title: TTS
       - type: grid
         cards:
+          - type: heading
+            heading: Briefings Run Today
           - type: entities
             entities:
               - entity: input_boolean.good_morning
@@ -1360,9 +1394,10 @@ views:
                 secondary_info: last-triggered
             state_color: true
             show_header_toggle: false
-        title: Briefings Run Today
       - type: grid
         cards:
+          - type: heading
+            heading: Volume Settings
           - type: entities
             entities:
               - entity: input_number.basement_echo_dot_day_volume
@@ -1521,9 +1556,10 @@ views:
             entities:
               - entity: script.volume_reset
                 secondary_info: Run to apply these settings
-        title: Volume Settings
       - type: grid
         cards:
+          - type: heading
+            heading: Media Players
           - square: true
             columns: 3
             type: grid
@@ -1546,7 +1582,6 @@ views:
                 entity: media_player.living_room_tv_chromecast
               - type: media-control
                 entity: media_player.master_bedroom_chromecast
-        title: Media Players
     max_columns: 4
     cards: []
   - title: Scheduler Automations
@@ -1556,6 +1591,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Scheduling Automations
           - type: entities
             entities:
               - entity: automation.work_today
@@ -1566,9 +1603,10 @@ views:
                 secondary_info: 4:00 AM
             show_header_toggle: false
             state_color: true
-        title: Scheduling Automations
       - type: grid
         cards:
+          - type: heading
+            heading: Automations Ran
           - type: entities
             entities:
               - entity: input_boolean.work_today_ran
@@ -1594,7 +1632,6 @@ views:
               - entity: script.scheduling_reset
             state_color: true
             show_header_toggle: false
-        title: Automations Ran
   - title: Computer Tools
     path: computer-tools
     icon: mdi:laptop
@@ -1602,6 +1639,8 @@ views:
     sections:
       - type: grid
         cards:
+          - type: heading
+            heading: Kallen Desktop
           - show_state: false
             show_name: true
             camera_view: auto
@@ -1632,9 +1671,10 @@ views:
                 name: Displays ON
             show_header_toggle: false
             state_color: true
-        title: Kallen Desktop
       - type: grid
         cards:
+          - type: heading
+            heading: Config Parameters
           - type: entities
             entities:
               - entity: input_number.basement_computers_idle_time
@@ -1645,9 +1685,10 @@ views:
                 secondary_info: Idle Time
             show_header_toggle: false
             state_color: true
-        title: Config Parameters
       - type: grid
         cards:
+          - type: heading
+            heading: XR500 Controls
           - type: entities
             entities:
               - entity: switch.xr500_2_4g_guest_wifi
@@ -1670,9 +1711,10 @@ views:
                 name: Update
             show_header_toggle: false
             state_color: true
-        title: XR500 Controls
       - type: grid
         cards:
+          - type: heading
+            heading: XR500 Sensors
           - type: entities
             entities:
               - entity: sensor.xr500_average_ping
@@ -1721,6 +1763,5 @@ views:
                 name: Upload yesterday
             show_header_toggle: false
             state_color: true
-        title: XR500 Sensors
     max_columns: 4
     cards: []