diff --git a/siro_driver/lib/controller/home/navigation/navigation_view.dart b/siro_driver/lib/controller/home/navigation/navigation_view.dart
index c1ca3882..7d4dab89 100644
--- a/siro_driver/lib/controller/home/navigation/navigation_view.dart
+++ b/siro_driver/lib/controller/home/navigation/navigation_view.dart
@@ -41,23 +41,26 @@ class NavigationView extends StatelessWidget {
             children: [
               // ── 1. Map Layer ──────────────────────────────────────────────
               GetBuilder<SettingController>(
-                builder: (s) => IntaleqMap(
-                  apiKey: Env.mapSaasKey,
-                  onMapCreated: c.onMapCreated,
-                  onLongPress: (pos) => c.onMapLongPressed(Point(0, 0), pos),
-                  onTap: (pos) => c.onMapTapped(Point(0, 0), pos),
-                  markers: c.markers,
-                  polylines: c.polylines,
-                  circles: c.circles,
-                  polygons: c.polygons,
-                  mapType: s.isMapDarkMode
-                      ? IntaleqMapType
-                          .normal // Normal in SiroMap seems to be Dark
-                      : IntaleqMapType.light,
-                  initialCameraPosition: CameraPosition(
-                      target: c.myLocation ?? const LatLng(33.5138, 36.2765),
-                      zoom: 16.0),
-                  myLocationEnabled: false,
+                builder: (s) => Listener(
+                  onPointerDown: (_) => c.onUserPanned(),
+                  child: IntaleqMap(
+                    apiKey: Env.mapSaasKey,
+                    onMapCreated: c.onMapCreated,
+                    onLongPress: (pos) => c.onMapLongPressed(Point(0, 0), pos),
+                    onTap: (pos) => c.onMapTapped(Point(0, 0), pos),
+                    markers: c.markers,
+                    polylines: c.polylines,
+                    circles: c.circles,
+                    polygons: c.polygons,
+                    mapType: s.isMapDarkMode
+                        ? IntaleqMapType
+                            .normal // Normal in SiroMap seems to be Dark
+                        : IntaleqMapType.light,
+                    initialCameraPosition: CameraPosition(
+                        target: c.myLocation ?? const LatLng(33.5138, 36.2765),
+                        zoom: 16.0),
+                    myLocationEnabled: false,
+                  ),
                 ),
               ),
 
@@ -88,10 +91,10 @@ class NavigationView extends StatelessWidget {
               _LocationPickerOverlay(controller: c),
 
               // ── 10. Recenter Button ───────────────────────────────────────
-              if (!c.isCameraLocked && !c.isNavigating)
+              if (!c.isCameraLocked)
                 Positioned(
                   right: 16,
-                  bottom: 250,
+                  bottom: c.isNavigating ? 150 : 250,
                   child: _buildMapFAB(
                     icon: Icons.my_location_rounded,
                     onTap: () => c.relockCameraToUser(),