diff --git a/lib/main.dart b/lib/main.dart
index 48924fc..9be6c3c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -121,15 +121,14 @@ class _HomeScreenState extends State<HomeScreen> {
   Future<void> _loadPrefs() async {
     final prefs = await SharedPreferences.getInstance();
     setState(() {
-      final lat = prefs.getDouble('lat');
-      final lng = prefs.getDouble('lng');
-      final sunset = prefs.getString('sunset_time');
+      _latController.text = prefs.getDouble('lat').toString();
+      _lngController.text = prefs.getDouble('lng').toString();
+      _sunsetController.text = prefs.getString('sunset_time').toString();
       _alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
       _minutesBefore = prefs.getInt('minutes_before') ?? 30;
-      if (lat != null) _latController.text = lat.toString();
-      if (lng != null) _lngController.text = lng.toString();
-      if (sunset != null) _sunsetController.text = sunset;
-      _minutesController.text = '$_minutesBefore';
+      _minutesController.text = _minutesBefore.toString();
+      _plural = prefs.getString('plural').toString();
+      _validTime = prefs.getBool('valid_time') ?? false;
     });
     if (_alarmEnabled && _sunsetController.text.isNotEmpty) {
       _scheduleAlarm();
@@ -147,6 +146,8 @@ class _HomeScreenState extends State<HomeScreen> {
     }
     await prefs.setBool('alarm_enabled', _alarmEnabled);
     await prefs.setInt('minutes_before', _minutesBefore);
+    await prefs.setString('plural', _plural);
+    await prefs.setBool('valid_time', _validTime);
   }
 
   Future<void> _getGpsLocation() async {
@@ -565,13 +566,13 @@ class _HomeScreenState extends State<HomeScreen> {
                               title: Text(
                                 _alarmEnabled ? 'Sunset Alarm Enabled' : "",
                               ),
-                      subtitle: Text(
+                              subtitle: Text(
                                 _validTime
                                     ? _alarmEnabled
-                            ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
+                                        ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
                                         : ""
                                     : "Add Time",
-                      ),
+                              ),
                               value: _alarmEnabled,
                               onChanged: _toggleAlarm,
                             )