diff --git a/src/app/map/calibrate/calibrate.component.ts b/src/app/map/calibrate/calibrate.component.ts
index 013d604..b3434a2 100644
--- a/src/app/map/calibrate/calibrate.component.ts
+++ b/src/app/map/calibrate/calibrate.component.ts
@@ -14,7 +14,9 @@ export class CalibrateComponent {
         this.physicsService.calibrate.next(c);
     }
 
-    constructor(private bottomSheetRef: MatBottomSheetRef, private physicsService: PhysicsService) { }
+    constructor(private bottomSheetRef: MatBottomSheetRef, private physicsService: PhysicsService) {
+        this._calibration = this.physicsService.calibrate.value;
+    }
 
     close() {
         this.bottomSheetRef.dismiss();
diff --git a/src/app/map/map.component.ts b/src/app/map/map.component.ts
index 64ed801..b876e81 100644
--- a/src/app/map/map.component.ts
+++ b/src/app/map/map.component.ts
@@ -36,7 +36,7 @@ export class MapComponent {
 
                 if(this.position.heading != null) {
                     let marker: HTMLElement = document.querySelector('img[src*="arrow.png"]');
-                    if(marker) marker.style.transform = `rotate(${this.position.heading}deg)`
+                    if(marker) marker.style.transform = `rotate(-${this.position.heading}deg)`
                 }
             }
         });