diff --git a/src/Logic/UIEventSource.ts b/src/Logic/UIEventSource.ts
index 22e2431cc..c4af67e6e 100644
--- a/src/Logic/UIEventSource.ts
+++ b/src/Logic/UIEventSource.ts
@@ -87,6 +87,8 @@ export class Stores {
         })
         return newStore
     }
+
+
 }
 
 export abstract class Store<T> implements Readable<T> {
@@ -347,6 +349,16 @@ export abstract class Store<T> implements Readable<T> {
             }
         })
     }
+
+    /**
+     * Create a new UIEVentSource. Whenever 'this.data' changes, the returned UIEventSource will get this value as well.
+     * However, this value can be overridden without affecting source
+     */
+    public followingClone(): UIEventSource<T> {
+        const src = new UIEventSource(this.data)
+        this.addCallback((t) => src.setData(t))
+        return src
+    }
 }
 
 export class ImmutableStore<T> extends Store<T> {
@@ -814,17 +826,6 @@ export class UIEventSource<T> extends Store<T> implements Writable<T> {
             (b) => JSON.stringify(b) ?? ""
         )
     }
-
-    /**
-     * Create a new UIEVentSource. Whenever 'source' changes, the returned UIEventSource will get this value as well.
-     * However, this value can be overriden without affecting source
-     */
-    static feedFrom<T>(store: Store<T>): UIEventSource<T> {
-        const src = new UIEventSource(store.data)
-        store.addCallback((t) => src.setData(t))
-        return src
-    }
-
     /**
      * Adds a callback
      *
diff --git a/src/Models/MapProperties.ts b/src/Models/MapProperties.ts
index b5a3f1974..e4e46ba58 100644
--- a/src/Models/MapProperties.ts
+++ b/src/Models/MapProperties.ts
@@ -18,6 +18,9 @@ export interface MapProperties {
     readonly maxbounds: UIEventSource<undefined | BBox>
     readonly allowMoving: UIEventSource<true | boolean>
     readonly allowRotating: UIEventSource<true | boolean>
+    /**
+     * Current rotation of the map, ccw in degrees
+     */
     readonly rotation: UIEventSource<number>
     readonly pitch: UIEventSource<number>
     readonly lastClickLocation: Store<{
diff --git a/src/UI/BigComponents/CompassWidget.svelte b/src/UI/BigComponents/CompassWidget.svelte
index 8cec2bc39..dc7e7d745 100644
--- a/src/UI/BigComponents/CompassWidget.svelte
+++ b/src/UI/BigComponents/CompassWidget.svelte
@@ -22,7 +22,7 @@
   let compassLoaded = Orientation.singleton.gotMeasurement
   let allowRotation = mapProperties.allowRotating
 
-  function clicked(e: Event) {
+  function clicked() {
     if (mapProperties.rotation.data === 0) {
       if (mapProperties.allowRotating.data && compassLoaded.data) {
         mapProperties.rotation.set(orientation.data)
@@ -35,9 +35,8 @@
 
 {#if $allowRotation || $gotNonZero}
   <button
-    style="z-index: -1"
     class={"as-link pointer-events-auto relative " + size}
-    on:click={(e) => clicked(e)}
+    on:click={() => clicked()}
   >
     {#if $allowRotation && !$compassLoaded && !$gotNonZero}
       <div
diff --git a/src/UI/BigComponents/NewPointLocationInput.svelte b/src/UI/BigComponents/NewPointLocationInput.svelte
index 31abb1263..595cb82dd 100644
--- a/src/UI/BigComponents/NewPointLocationInput.svelte
+++ b/src/UI/BigComponents/NewPointLocationInput.svelte
@@ -76,7 +76,10 @@
     allowMoving: new UIEventSource<boolean>(true),
     allowZooming: new UIEventSource<boolean>(true),
     minzoom: new UIEventSource<number>(18),
-    rasterLayer: UIEventSource.feedFrom(state.mapProperties.rasterLayer),
+    rasterLayer: state.mapProperties.rasterLayer.followingClone(),
+    allowRotating: state.mapProperties.allowRotating,
+    rotation: state.mapProperties.rotation.followingClone()
+
   }
   state?.showCurrentLocationOn(map)
 
diff --git a/src/UI/BigComponents/WaySplitMap.svelte b/src/UI/BigComponents/WaySplitMap.svelte
index aa00d52f8..5d0132d48 100644
--- a/src/UI/BigComponents/WaySplitMap.svelte
+++ b/src/UI/BigComponents/WaySplitMap.svelte
@@ -25,6 +25,7 @@
   import type { Feature, LineString, Point } from "geojson"
   import type { SpecialVisualizationState } from "../SpecialVisualization"
   import SmallZoomButtons from "../Map/SmallZoomButtons.svelte"
+  import CompassWidget from "./CompassWidget.svelte"
 
   const splitpoint_style = new LayerConfig(
     <LayerConfigJson>split_point,
@@ -51,7 +52,7 @@
   /**
    * Optional: use these properties to set e.g. background layer
    */
-  export let mapProperties: undefined | Partial<MapProperties> = undefined
+  export let mapProperties: undefined | Partial<Omit<MapProperties, "lastClickLocation">> = undefined
 
   /**
    * Reuse a point if the clicked location is within this amount of meter
@@ -156,4 +157,7 @@
 <div class="relative h-full w-full">
   <MaplibreMap {map} mapProperties={adaptor} />
   <SmallZoomButtons {adaptor} />
+  <div class="absolute top-0 left-0">
+    <CompassWidget mapProperties={adaptor} />
+  </div>
 </div>
diff --git a/src/UI/InputElement/Helpers/DistanceInput.svelte b/src/UI/InputElement/Helpers/DistanceInput.svelte
index 6aa03dc79..a998d6440 100644
--- a/src/UI/InputElement/Helpers/DistanceInput.svelte
+++ b/src/UI/InputElement/Helpers/DistanceInput.svelte
@@ -51,10 +51,12 @@
       state?.mapProperties.rasterLayer.addCallbackD((layer) => rasterLayer.set(layer))
     }
   }
-  let mapProperties: Partial<MapProperties> = {
+  let mapProperties: Partial<MapProperties> & { location } = {
     rasterLayer: rasterLayer,
     location: mapLocation,
     zoom: new UIEventSource(args?.zoom ?? 18),
+    rotation: state.mapProperties.rotation.followingClone(),
+    lastClickLocation: new UIEventSource(undefined)
   }
 
   let start: UIEventSource<{ lon: number; lat: number }> = new UIEventSource(undefined)
@@ -98,6 +100,13 @@
     layer: new LayerConfig(conflation),
     features: new StaticFeatureSource(lengthFeature),
   })
+
+  mapProperties.lastClickLocation.addCallbackAndRunD(lonlat => {
+    if (start.data === undefined) {
+      start.set(lonlat)
+    }
+    mapProperties.location.set(lonlat)
+  }, onDestroy)
   const t = Translations.t.input_helpers.distance
 </script>
 
diff --git a/src/UI/InputElement/Helpers/LocationInput.svelte b/src/UI/InputElement/Helpers/LocationInput.svelte
index 7993e20c4..c06ba202d 100644
--- a/src/UI/InputElement/Helpers/LocationInput.svelte
+++ b/src/UI/InputElement/Helpers/LocationInput.svelte
@@ -14,6 +14,7 @@
   import { createEventDispatcher, onDestroy } from "svelte"
   import Move_arrows from "../../../assets/svg/Move_arrows.svelte"
   import SmallZoomButtons from "../../Map/SmallZoomButtons.svelte"
+  import CompassWidget from "../../BigComponents/CompassWidget.svelte"
 
   /**
    * A visualisation to pick a location on a map background
@@ -92,7 +93,6 @@
 <div class="relative h-full min-h-32 cursor-pointer overflow-hidden">
   <div class="absolute left-0 top-0 h-full w-full cursor-pointer">
     <MaplibreMap
-      center={{ lng: initialCoordinate.lon, lat: initialCoordinate.lat }}
       {map}
       mapProperties={mla}
     />
@@ -108,4 +108,8 @@
 
   <DragInvitation hideSignal={mla.location} />
   <SmallZoomButtons adaptor={mla} />
+  <div class="absolute top-0 left-0 ">
+    <CompassWidget mapProperties={mla} />
+  </div>
 </div>
+
diff --git a/src/UI/Map/MapLibreAdaptor.ts b/src/UI/Map/MapLibreAdaptor.ts
index 9d63dc237..ff876aa5a 100644
--- a/src/UI/Map/MapLibreAdaptor.ts
+++ b/src/UI/Map/MapLibreAdaptor.ts
@@ -70,7 +70,14 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
 
     constructor(
         maplibreMap: Store<MLMap>,
-        state?: Partial<MapProperties>,
+        state?: Partial<MapProperties & {
+            lastClickLocation: UIEventSource<{
+                lon: number
+                lat: number
+                mode: "left" | "right" | "middle"
+                nearestFeature?: Feature
+            }>
+        }>,
         options?: {
             correctClick?: number
         }
@@ -114,7 +121,7 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
             state?.rasterLayer ?? new UIEventSource<RasterLayerPolygon | undefined>(undefined)
         this.showScale = state?.showScale ?? new UIEventSource<boolean>(false)
 
-        const lastClickLocation = new UIEventSource<{
+        const lastClickLocation = state?.lastClickLocation ?? new UIEventSource<{
             lat: number
             lon: number
             mode: "left" | "right" | "middle"
@@ -156,7 +163,6 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
                             const way = <Feature<LineString>>feature
                             const lngLat: [number, number] = [e.lngLat.lng, e.lngLat.lat]
                             const p = GeoOperations.nearestPoint(way, lngLat)
-                            console.log(">>>", p, way, lngLat)
                             if (!p) {
                                 continue
                             }
@@ -182,7 +188,7 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
             this.setMinzoom(this.minzoom.data)
             this.setMaxzoom(this.maxzoom.data)
             this.setBounds(this.bounds.data)
-            this.setRotation(this.rotation.data)
+            this.setRotation(Math.floor(this.rotation.data))
             this.setScale(this.showScale.data)
             this.updateStores(true)
         }
@@ -562,6 +568,11 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
         if (!map || bearing === undefined) {
             return
         }
+        if (Math.abs(map.getBearing() - bearing) < 0.1) {
+            // We don't bother to actually rotate
+            // Aborting small changes helps to dampen changes
+            return
+        }
         map.rotateTo(bearing, { duration: 500 })
     }
 
@@ -769,8 +780,8 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
     public installQuicklocation(ratelimitMs = 50) {
         this._maplibreMap.addCallbackAndRunD((map) => {
             let lastUpdate = new Date().getTime()
-            map.on("drag", (e) => {
-                let now = new Date().getTime()
+            map.on("drag", () => {
+                const now = new Date().getTime()
                 if (now - lastUpdate < ratelimitMs) {
                     return
                 }
diff --git a/src/UI/Map/MaplibreMap.svelte b/src/UI/Map/MaplibreMap.svelte
index d44740695..ec4d2e9d2 100644
--- a/src/UI/Map/MaplibreMap.svelte
+++ b/src/UI/Map/MaplibreMap.svelte
@@ -56,6 +56,7 @@
       maxZoom: 24,
       interactive: true,
       attributionControl: false,
+      bearing: mapProperties?.rotation?.data ?? 0
     }
     _map = new maplibre.Map(options)
     window.requestAnimationFrame(() => {
diff --git a/src/UI/Map/OverlayMap.svelte b/src/UI/Map/OverlayMap.svelte
index e2a3c116b..6e30cac14 100644
--- a/src/UI/Map/OverlayMap.svelte
+++ b/src/UI/Map/OverlayMap.svelte
@@ -24,9 +24,9 @@
   let altmap: UIEventSource<MlMap> = new UIEventSource(undefined)
   let altproperties = new MapLibreAdaptor(altmap, {
     rasterLayer,
-    zoom: UIEventSource.feedFrom(placedOverMapProperties.zoom),
-    rotation: UIEventSource.feedFrom(placedOverMapProperties.rotation),
-    pitch: UIEventSource.feedFrom(placedOverMapProperties.pitch),
+    zoom: placedOverMapProperties.zoom.followingClone(),
+    rotation: placedOverMapProperties.rotation.followingClone(),
+    pitch: placedOverMapProperties.pitch.followingClone()
   })
   altproperties.allowMoving.setData(false)
   altproperties.allowZooming.setData(false)
diff --git a/src/UI/Map/RasterLayerPicker.svelte b/src/UI/Map/RasterLayerPicker.svelte
index b19de36db..5d38bee26 100644
--- a/src/UI/Map/RasterLayerPicker.svelte
+++ b/src/UI/Map/RasterLayerPicker.svelte
@@ -45,7 +45,7 @@
     )
   }
 
-  let rasterLayerOnMap = UIEventSource.feedFrom(rasterLayer)
+  let rasterLayerOnMap = rasterLayer.followingClone()
 
   if (shown) {
     onDestroy(
diff --git a/src/UI/Popup/ImportButtons/WayImportFlow.svelte b/src/UI/Popup/ImportButtons/WayImportFlow.svelte
index 66dafc20f..e6f8106cf 100644
--- a/src/UI/Popup/ImportButtons/WayImportFlow.svelte
+++ b/src/UI/Popup/ImportButtons/WayImportFlow.svelte
@@ -21,8 +21,8 @@
   const map = new UIEventSource<MlMap>(undefined)
   const [lon, lat] = GeoOperations.centerpointCoordinates(importFlow.originalFeature)
   const mla = new MapLibreAdaptor(map, {
-    allowMoving: UIEventSource.feedFrom(state.featureSwitchIsTesting),
-    allowZooming: UIEventSource.feedFrom(state.featureSwitchIsTesting),
+    allowMoving: state.featureSwitchIsTesting.followingClone(),
+    allowZooming: state.featureSwitchIsTesting.followingClone(),
     rasterLayer: state.mapProperties.rasterLayer,
     location: new UIEventSource<{ lon: number; lat: number }>({ lon, lat }),
     zoom: new UIEventSource<number>(18),
diff --git a/src/UI/Popup/MinimapViz.svelte b/src/UI/Popup/MinimapViz.svelte
index 8b6f8a500..a40a65d80 100644
--- a/src/UI/Popup/MinimapViz.svelte
+++ b/src/UI/Popup/MinimapViz.svelte
@@ -60,6 +60,8 @@
     rasterLayer: state.mapProperties.rasterLayer,
     zoom: new UIEventSource<number>(17),
     maxzoom: new UIEventSource<number>(17),
+    rotation: state.mapProperties.rotation.followingClone(),
+    allowRotating: state.mapProperties.allowRotating.followingClone()
   })
 
   mla.allowMoving.setData(false)
diff --git a/src/UI/Popup/MoveWizard.svelte b/src/UI/Popup/MoveWizard.svelte
index 1ac286bcb..7a9d2014a 100644
--- a/src/UI/Popup/MoveWizard.svelte
+++ b/src/UI/Popup/MoveWizard.svelte
@@ -47,13 +47,14 @@
   function initMapProperties(reason: MoveReason): Partial<MapProperties> & { location } {
     return {
       allowMoving: new UIEventSource(true),
-      allowRotating: new UIEventSource(false),
+      allowRotating: state.mapProperties.allowRotating.followingClone(),
       allowZooming: new UIEventSource(true),
       bounds: new UIEventSource(undefined),
       location: new UIEventSource({ lon, lat }),
       minzoom: new UIEventSource(reason.minZoom),
       rasterLayer: state.mapProperties.rasterLayer,
       zoom: new UIEventSource(reason?.startZoom ?? 16),
+      rotation: state.mapProperties.rotation.followingClone()
     }
   }
 
@@ -72,7 +73,7 @@
   let isSearching = new UIEventSource<boolean>(false)
   let zoomedInEnough = currentMapProperties
     .bindD((properties) => properties.zoom, onDestroy)
-    .mapD((zoom) => zoom >= Constants.minZoomLevelToAddNewPoint, onDestroy)
+    .mapD((zoom: number) => zoom >= Constants.minZoomLevelToAddNewPoint, onDestroy)
   const searcher = new NominatimGeocoding(1)
 
   async function searchPressed() {
diff --git a/src/UI/Popup/SplitRoadWizard.svelte b/src/UI/Popup/SplitRoadWizard.svelte
index 094572647..b49fcea46 100644
--- a/src/UI/Popup/SplitRoadWizard.svelte
+++ b/src/UI/Popup/SplitRoadWizard.svelte
@@ -94,7 +94,7 @@
             {splitPoints}
             {osmWay}
             {snapTolerance}
-            mapProperties={{ rasterLayer: state.mapProperties.rasterLayer }}
+            mapProperties={{ rasterLayer: state.mapProperties.rasterLayer, rotation: state.mapProperties.rotation.followingClone() }}
           />
         </div>
         <div class="flex w-full flex-wrap-reverse md:flex-nowrap">