diff --git a/lib/main.dart b/lib/main.dart
index 0f8600c..48924fc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -79,8 +79,8 @@ class HomeScreen extends StatefulWidget {
 class _HomeScreenState extends State<HomeScreen> {
   final _latController = TextEditingController();
   final _lngController = TextEditingController();
-  final _sunsetController = TextEditingController();
-  final _minutesController = TextEditingController(text: '30');
+  final _sunsetController = TextEditingController(text: "18:00");
+  final _minutesController = TextEditingController(text: "30");
 
   final FlutterLocalNotificationsPlugin _notifications =
       FlutterLocalNotificationsPlugin();
@@ -559,18 +559,23 @@ class _HomeScreenState extends State<HomeScreen> {
 
                   // --- Toggle ---
                   Expanded(
-                    child: SwitchListTile(
-                      //title: const Text('Enable Sunset Alarm'),
-                      title: Text(_alarmEnabled ? 'Sunset Alarm Enabled' : ""),
+                    child:
+                        _validTime
+                            ? SwitchListTile(
+                              title: Text(
+                                _alarmEnabled ? 'Sunset Alarm Enabled' : "",
+                              ),
                       subtitle: Text(
-                        _alarmEnabled
+                                _validTime
+                                    ? _alarmEnabled
                             ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
-                            : "",
+                                        : ""
+                                    : "Add Time",
                       ),
-                      value: _validTime ? _alarmEnabled : false,
-                      // If _isDataLoaded is false, onChanged is null, disabling the switch
-                      onChanged: _validTime ? _toggleAlarm : null,
-                    ),
+                              value: _alarmEnabled,
+                              onChanged: _toggleAlarm,
+                            )
+                            : Center(child: Text("Sunset Time Invalid")),
                   ),
                 ],
               ),