diff --git a/config/lovelace/home_dashboard/00_home.yaml b/config/lovelace/home_dashboard/00_home.yaml
index 671be82..87abe11 100644
--- a/config/lovelace/home_dashboard/00_home.yaml
+++ b/config/lovelace/home_dashboard/00_home.yaml
@@ -107,7 +107,8 @@ cards:
     cards:
       - type: entities
         entities:
-          - input_boolean.alarm_enabled
+          - entity: input_boolean.alarm_enabled
+            name: Alarm
           - input_datetime.alarm_time
       - type: "custom:weather-card"
         current: true
diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml
index 654d65f..8b850a5 100644
--- a/config/packages/routines/good_night.yaml
+++ b/config/packages/routines/good_night.yaml
@@ -16,7 +16,3 @@ script:
       - service: script.say_discretely
         data:
           message: "Entering sleep mode. Good night!"
-
-      # Prepare for the next day.
-      - delay: 00:00:05
-      - service: script.music_join_sonoses
diff --git a/config/packages/routines/waking_up.yaml b/config/packages/routines/waking_up.yaml
index 143436b..9a5ac60 100644
--- a/config/packages/routines/waking_up.yaml
+++ b/config/packages/routines/waking_up.yaml
@@ -25,7 +25,7 @@ script:
         data:
           message: "Here's some music to start the day!"
       - delay: 00:00:02
-
+      - service: script.music_join_sonoses
       - service: script.music_play
 
   routine_morning_briefing:
diff --git a/config/tablet-lovelace.yaml b/config/tablet-lovelace.yaml
index d26a203..205111b 100644
--- a/config/tablet-lovelace.yaml
+++ b/config/tablet-lovelace.yaml
@@ -134,6 +134,7 @@ views:
                       - type: custom:button-card
                         template: small
                         entity: input_boolean.alarm_enabled
+                        name: Alarm
                       - type: entities
                         style: |
                           ha-card {