diff --git a/config/automation/Speech/announcements.yaml b/config/automation/Speech/announcements.yaml
index 2f118a26..a1065f07 100755
--- a/config/automation/Speech/announcements.yaml
+++ b/config/automation/Speech/announcements.yaml
@@ -80,3 +80,11 @@
       data_template:
         object_id: "arriving"
         entities: []
+
+    # Only Disarm if armed.  Otherwise, Exit out. 
+    - condition: state
+      entity_id: alarm_control_panel.alexa_guard
+      state: armed
+
+    - service: alarm_control_panel.alarm_disarm
+      entity_id: alarm_control_panel.alexa_guard
diff --git a/config/automation/away.yaml b/config/automation/away.yaml
index d01eee82..76c276da 100755
--- a/config/automation/away.yaml
+++ b/config/automation/away.yaml
@@ -4,6 +4,7 @@
 
 - alias: 'Away Mode'
   id: 712e845a-9d72-4993-b8af-890b167c807b
+  mode: single
   trigger:
     - platform: state
       entity_id: binary_sensor.downstairs_nest_away
@@ -11,16 +12,12 @@
     - platform: state
       entity_id: group.family
       to: 'not_home'
-    - platform: state
-      entity_id: input_boolean.good_night
-      to: 'on'
     - platform: event
       #Sent from IFTTT Webhooks : {"action":"IFTTT_Away:}
       event_type: ifttt_webhook_received
       event_data:
         action: IFTTT_Away
 
-
   condition:
     - condition: state
       entity_id: group.family
@@ -31,7 +28,10 @@
 
   action:
     - service: script.interior_off
+
     - service: switch.turn_off
       entity_id: switch.back_landscaping
-    - service: input_boolean.turn_off
-      entity_id: input_boolean.good_night
+
+      # Arms Alexa Guard.  Disarms in the Announcements.yaml
+    - service: alarm_control_panel.alarm_arm_away
+      entity_id: alarm_control_panel.alexa_guard
diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png
index 02a22bd2..c51ef178 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ