diff --git a/src/routes/(game)/game/play/[sessionCode]/+layout.server.ts b/src/routes/(game)/game/play/[sessionCode]/+layout.server.ts
index 96d5f47..43531ef 100644
--- a/src/routes/(game)/game/play/[sessionCode]/+layout.server.ts
+++ b/src/routes/(game)/game/play/[sessionCode]/+layout.server.ts
@@ -100,7 +100,10 @@ export const load: LayoutServerLoad = async ({ params, url }) => {
 					description: displayedStepRecord.description ?? undefined,
 					content: displayedStepRecord.content ?? undefined,
 					type: displayedStepRecord.type,
-					hint: displayedStepRecord.hint ?? undefined
+					hint: displayedStepRecord.hint ?? undefined,
+					latitude: displayedStepRecord.latitude ?? null,
+					longitude: displayedStepRecord.longitude ?? null,
+					proximityRadius: displayedStepRecord.proximityRadius ?? 50
 				}
 			: null,
 		unlockedSteps: unlockedSteps.map((entry) => ({
diff --git a/src/routes/(game)/game/play/[sessionCode]/+page.svelte b/src/routes/(game)/game/play/[sessionCode]/+page.svelte
index f1ee178..a8dbc12 100644
--- a/src/routes/(game)/game/play/[sessionCode]/+page.svelte
+++ b/src/routes/(game)/game/play/[sessionCode]/+page.svelte
@@ -80,7 +80,7 @@
 		return ((θ * 180) / Math.PI + 360) % 360;
 	}
 
-	// Update arrow rotation based on user heading and target bearing
+	// Calculate distance - works independently of orientation
 	$effect(() => {
 		if (
 			currentStep?.type === 'location' &&
@@ -97,7 +97,21 @@
 				currentStep.longitude
 			);
 			distance = Math.round(dist);
+		} else {
+			distance = null;
+		}
+	});
 
+	// Calculate arrow rotation - works with or without device orientation
+	$effect(() => {
+		if (
+			currentStep?.type === 'location' &&
+			isCurrentActiveStep &&
+			userLat !== null &&
+			userLon !== null &&
+			currentStep.latitude != null &&
+			currentStep.longitude != null
+		) {
 			const bearing = calculateBearing(
 				userLat,
 				userLon,
@@ -105,10 +119,9 @@
 				currentStep.longitude
 			);
 
-			// If we have device heading, rotate relative to it; otherwise just use absolute bearing
+			// If we have device heading, rotate relative to it; otherwise use absolute bearing (north = 0°)
 			arrowRotation = heading !== null ? bearing - heading : bearing;
 		} else {
-			distance = null;
 			arrowRotation = 0;
 		}
 	});