diff --git a/lib/main.dart b/lib/main.dart
index d8d681e..aa1530f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -186,9 +186,16 @@ class _MainState extends State<Main> with SingleTickerProviderStateMixin {
 
     return ColoredSafeArea(
       key: GlobalKey(),
-      child: PopScope(
-        canPop: contentStack.isNotEmpty,
-        onPopInvoked: (didPop) => {_popContentView()},
+      child: WillPopScope(
+        onWillPop: () async {
+          if (contentStack.isNotEmpty) {
+            _popContentView();
+
+            return false;
+          } else {
+            return true;
+          }
+        },
         child: Scaffold(
           appBar: PreferredSize(
             preferredSize: const Size.fromHeight(100),
diff --git a/lib/popups/map_popup.dart b/lib/popups/map_popup.dart
index 19c02a6..2a7e2e5 100644
--- a/lib/popups/map_popup.dart
+++ b/lib/popups/map_popup.dart
@@ -104,6 +104,16 @@ void showMapPopup(BuildContext context, JobTour currentTour, List<JobTour> tourL
 
       final ValueNotifier<bool> valueNotifier = ValueNotifier<bool>(true);
 
+      List<Marker> markers = [];
+      for (var tour in tourList) {
+        markers.add(
+          Marker(
+            builder: (context) => const Icon(Icons.person_pin_circle, size: 56, color: Colors.blue),
+            point: LatLng(tour.pos!.lat, tour.pos!.long)
+          )
+        );
+      }
+
       return Container(
           padding: const EdgeInsets.fromLTRB(30, 0, 30, 0),
           key: GlobalKey(),
@@ -184,6 +194,9 @@ void showMapPopup(BuildContext context, JobTour currentTour, List<JobTour> tourL
                             urlTemplate: 'https://google-maps.assecutor.de/vt/lyrs=m@130&hl=en&x={x}&y={y}&z={z}',
                             userAgentPackageName: 'com.example.app',
                           ),
+                          MarkerLayer(
+                            markers: markers,
+                          ),
                         ],
                       ),
                     ),