diff --git a/lib/gps_service.dart b/lib/gps_service.dart
index 3ae26a8..5e81ed6 100644
--- a/lib/gps_service.dart
+++ b/lib/gps_service.dart
@@ -3,11 +3,14 @@ import 'package:geolocator/geolocator.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class GpsService {
+  static double? _lastValidHeading;
+  
   static Stream<Position> get positionStream {
     return Geolocator.getPositionStream(
       locationSettings: const LocationSettings(
         accuracy: LocationAccuracy.bestForNavigation,
-        distanceFilter: 1,
+        distanceFilter: 0,
+        timeLimit: Duration(seconds: 10),
       ),
     );
   }
@@ -21,16 +24,24 @@ class GpsService {
     return await Geolocator.isLocationServiceEnabled();
   }
   
+  static double getCachedHeading(double heading) {
+    if (heading >= 0 && heading <= 360) {
+      _lastValidHeading = heading;
+      return heading;
+    }
+    return _lastValidHeading ?? 0.0;
+  }
+  
   static String getCompassDirection(double heading) {
-    if (heading < 0) return 'N/A';
+    final cachedHeading = getCachedHeading(heading);
     
     const directions = ['N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW'];
-    final index = ((heading + 22.5) / 45).floor() % 8;
+    final index = ((cachedHeading + 22.5) / 45).floor() % 8;
     return directions[index];
   }
   
   static String formatHeading(double heading) {
-    if (heading < 0) return 'N/A';
-    return '${heading.round()} ${getCompassDirection(heading)}';
+    final cachedHeading = getCachedHeading(heading);
+    return '${cachedHeading.round()}° ${getCompassDirection(heading)}';
   }
 }
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 589be05..f2a4763 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -5,6 +5,7 @@ import 'package:wakelock_plus/wakelock_plus.dart';
 import 'speed_units.dart';
 import 'gps_service.dart';
 import 'color_themes.dart';
+import 'dart:math' as math; // Import for math.pi
 
 void main() {
   runApp(const SpeedoApp());
@@ -117,11 +118,18 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> {
       _currentThemeIndex = ColorThemes.getNextThemeIndex(_currentThemeIndex);
     });
   }
+  
+  String _getSpeedDisplayText(double displaySpeed) {
+    if (_speed == 0.0 && _heading == -1.0) {
+      return '--';
+    }
+    return displaySpeed.toStringAsFixed(0);
+  }
 
   @override
   Widget build(BuildContext context) {
     final displaySpeed = _currentUnit.convert(_speed);
-    final speedText = displaySpeed.toStringAsFixed(0);
+    final speedText = _getSpeedDisplayText(displaySpeed);
     final currentTheme = ColorThemes.getTheme(_currentThemeIndex);
     
     return Scaffold(
@@ -222,10 +230,13 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> {
                 children: [
                   Flexible(
                     flex: 2,
-                    child: Icon(
-                      Icons.navigation,
-                      size: 100,
-                      color: currentTheme.headingText,
+                    child: Transform.rotate(
+                      angle: (_heading >= 0 && _heading < 360) ? (_heading * math.pi / 180.0) : 0,
+                      child: Icon(
+                        Icons.navigation,
+                        size: 100,
+                        color: currentTheme.headingText,
+                      ),
                     ),
                   ),
                   Flexible(