diff --git a/lib/app_wrappers/InitLocationFromSettings.dart b/lib/app_wrappers/InitLocationFromSettings.dart
new file mode 100644
index 0000000..3851604
--- /dev/null
+++ b/lib/app_wrappers/InitLocationFromSettings.dart
@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class InitLocationFromSettings extends StatelessWidget {
+  const InitLocationFromSettings({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Placeholder();
+  }
+}
diff --git a/lib/constants/values.dart b/lib/constants/values.dart
index bde1205..c7b6cd6 100644
--- a/lib/constants/values.dart
+++ b/lib/constants/values.dart
@@ -5,7 +5,7 @@ const TRANSLATION_HELP_URL = "https://github.com/Myzel394/locus";
 const DONATION_URL = "https://github.com/Myzel394/locus";
 const APK_RELEASES_URL = "https://github.com/Myzel394/locus/releases";
 
-const BACKGROUND_LOCATION_UPDATES_MINIMUM_DISTANCE_FILTER = 50;
+const BACKGROUND_LOCATION_UPDATES_MINIMUM_DISTANCE_FILTER = 30;
 
 const LOCATION_FETCH_TIME_LIMIT = Duration(minutes: 5);
 const LOCATION_INTERVAL = Duration(minutes: 1);
diff --git a/lib/services/current_location_service.dart b/lib/services/current_location_service.dart
index 065db0b..8e11d71 100644
--- a/lib/services/current_location_service.dart
+++ b/lib/services/current_location_service.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_map_location_marker/flutter_map_location_marker.dart';
 import 'package:geolocator/geolocator.dart';
+import 'package:locus/screens/LocationsOverviewScreen.dart';
 
 class CurrentLocationService extends ChangeNotifier {
   final StreamController<Position> _positionStreamController =
@@ -11,6 +12,7 @@ class CurrentLocationService extends ChangeNotifier {
   final StreamController<LocationMarkerPosition>
       _locationMarkerStreamController = StreamController.broadcast();
   Position? currentPosition;
+  LocationStatus locationStatus = LocationStatus.stale;
 
   Stream<Position> get stream => _positionStreamController.stream;
 
diff --git a/pubspec.lock b/pubspec.lock
index d126e0f..6108353 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -253,10 +253,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.17.1"
   convert:
     dependency: transitive
     description:
@@ -809,10 +809,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.18.0"
   io:
     dependency: transitive
     description:
@@ -937,18 +937,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.2.0"
   material_design_icons_flutter:
     dependency: "direct main"
     description:
@@ -1350,10 +1350,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
@@ -1398,10 +1398,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.5.1"
   timezone:
     dependency: transitive
     description:
@@ -1634,14 +1634,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.4-beta"
   web_socket_channel:
     dependency: transitive
     description: