diff --git a/Meshtastic/Persistence/PositionEntityExtension.swift b/Meshtastic/Persistence/PositionEntityExtension.swift
index ef67f4a7..ca7bd3e9 100644
--- a/Meshtastic/Persistence/PositionEntityExtension.swift
+++ b/Meshtastic/Persistence/PositionEntityExtension.swift
@@ -42,7 +42,7 @@ extension PositionEntity {
 }
 
 extension PositionEntity: MKAnnotation {
-	public var coordinate: CLLocationCoordinate2D { nodeCoordinate ?? CLLocationCoordinate2D(latitude: 0.0, longitude: 0.0) }
+	public var coordinate: CLLocationCoordinate2D { nodeCoordinate ?? LocationHelper.DefaultLocation }
 	public var title: String? {  nodePosition?.user?.shortName ?? NSLocalizedString("unknown", comment: "Unknown") }
 	public var subtitle: String? {  time?.formatted() }
 }
diff --git a/Meshtastic/Views/Map/MapViewSwiftUI.swift b/Meshtastic/Views/Map/MapViewSwiftUI.swift
index 14a59fae..3dab1e36 100644
--- a/Meshtastic/Views/Map/MapViewSwiftUI.swift
+++ b/Meshtastic/Views/Map/MapViewSwiftUI.swift
@@ -32,7 +32,7 @@ struct MapViewSwiftUI: UIViewRepresentable {
 		mapView.showsBuildings = true;
 		mapView.addAnnotations(positions)
 		mapView.showsUserLocation = true
-		mapView.setUserTrackingMode(.followWithHeading, animated: true)
+		mapView.setUserTrackingMode(.none, animated: false)
 		mapView.showsCompass = true
 		mapView.showsScale = true
 		mapView.isScrollEnabled = true
diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift
index c0fbd3e4..e44abb43 100644
--- a/Meshtastic/Views/Nodes/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/NodeDetail.swift
@@ -355,7 +355,9 @@ struct NodeDetail: View {
 										}
 									}
 								}
-							}						}
+							}
+							.padding(5)
+						}
 					}
 				}
 				.edgesIgnoringSafeArea([.leading, .trailing])