Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>

TheNoiseClock/Views/Alarms/AddAlarmView.swift

@@ -24,11 +24,12 @@ struct AddAlarmView: View {
     
     var body: some View {
         NavigationView {
+            ScrollView {
                 VStack(spacing: 0) {
                     TimePickerSection(selectedTime: $newAlarmTime)
                     TimeUntilAlarmSection(alarmTime: newAlarmTime)
                     
-                List {
+                    LazyVStack(spacing: 0) {
                         // Label Section
                         NavigationLink(destination: LabelEditView(label: $alarmLabel)) {
                             HStack {
@@ -40,7 +41,10 @@ struct AddAlarmView: View {
                                 Text(alarmLabel)
                                     .foregroundColor(.secondary)
                             }
+                            .padding()
+                            .background(Color(.systemGroupedBackground))
                         }
+                        .buttonStyle(PlainButtonStyle())
                         
                         // Sound Section
                         NavigationLink(destination: SoundSelectionView(selectedSound: $selectedSoundName)) {
@@ -53,7 +57,10 @@ struct AddAlarmView: View {
                                 Text(getSoundDisplayName(selectedSoundName))
                                     .foregroundColor(.secondary)
                             }
+                            .padding()
+                            .background(Color(.systemGroupedBackground))
                         }
+                        .buttonStyle(PlainButtonStyle())
                         
                         // Snooze Section
                         NavigationLink(destination: SnoozeSelectionView(snoozeDuration: $snoozeDuration)) {
@@ -66,9 +73,14 @@ struct AddAlarmView: View {
                                 Text("for \(snoozeDuration) min")
                                     .foregroundColor(.secondary)
                             }
+                            .padding()
+                            .background(Color(.systemGroupedBackground))
                         }
+                        .buttonStyle(PlainButtonStyle())
+                    }
+                    .cornerRadius(10)
+                    .padding(.horizontal)
                 }
-                .listStyle(.insetGrouped)
             }
             .navigationTitle("Alarm")
             .navigationBarTitleDisplayMode(.inline)

TheNoiseClock/Views/Alarms/AlarmView.swift

@@ -16,6 +16,16 @@ struct AlarmView: View {
     
     // MARK: - Body
     var body: some View {
+        Group {
+            if viewModel.alarms.isEmpty {
+                EmptyAlarmsView {
+                    showAddAlarm = true
+                }
+                .contentShape(Rectangle())
+                .onTapGesture {
+                    showAddAlarm = true
+                }
+            } else {
                 List {
                     ForEach(viewModel.alarms) { alarm in
                         AlarmRowView(
@@ -30,6 +40,8 @@ struct AlarmView: View {
                     }
                     .onDelete(perform: deleteAlarm)
                 }
+            }
+        }
         .navigationTitle("Alarms")
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {

TheNoiseClock/Views/Alarms/Components/EmptyAlarmsView.swift

@@ -0,0 +1,39 @@
+//
+//  EmptyAlarmsView.swift
+//  TheNoiseClock
+//
+//  Created by Matt Bruce on 9/7/25.
+//
+
+import SwiftUI
+
+/// Empty state view for when no alarms are configured
+struct EmptyAlarmsView: View {
+    
+    // MARK: - Properties
+    let onAddAlarm: () -> Void
+    
+    // MARK: - Body
+    var body: some View {
+        VStack(spacing: UIConstants.Spacing.medium) {
+            // Icon
+            Image(systemName: "alarm")
+                .font(.largeTitle)
+                .foregroundColor(.secondary)
+            
+            // Instructional text
+            Text("Create an alarm to begin")
+                .font(.subheadline)
+                .foregroundColor(.secondary)
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .background(Color.clear)
+    }
+}
+
+// MARK: - Preview
+#Preview {
+    EmptyAlarmsView {
+        print("Add alarm tapped")
+    }
+}