diff --git a/Meshtastic/Views/Nodes/Helpers/Map/MapSettingsForm.swift b/Meshtastic/Views/Nodes/Helpers/Map/MapSettingsForm.swift
index f094d5e8..4c18ef19 100644
--- a/Meshtastic/Views/Nodes/Helpers/Map/MapSettingsForm.swift
+++ b/Meshtastic/Views/Nodes/Helpers/Map/MapSettingsForm.swift
@@ -19,6 +19,7 @@ struct MapSettingsForm: View {
 	@Binding var traffic: Bool
 	@Binding var pointsOfInterest: Bool
 	@Binding var mapLayer: MapLayer
+	@Binding var meshMap: Bool
 
 	var body: some View {
 		
@@ -38,21 +39,23 @@ struct MapSettingsForm: View {
 					.onChange(of: mapLayer) { newMapLayer in
 						UserDefaults.mapLayer = newMapLayer
 					}
-					Toggle(isOn: $nodeHistory) {
-						Label("Node History", systemImage: "building.columns.fill")
-					}
-					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-					.onTapGesture {
-						self.nodeHistory.toggle()
-						UserDefaults.enableMapNodeHistoryPins = self.nodeHistory
-					}
-					Toggle(isOn: $routeLines) {
-						Label("Route Lines", systemImage: "road.lanes")
-					}
-					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-					.onTapGesture {
-						self.routeLines.toggle()
-						UserDefaults.enableMapRouteLines = self.routeLines
+					if !meshMap {
+						Toggle(isOn: $nodeHistory) {
+							Label("Node History", systemImage: "building.columns.fill")
+						}
+						.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+						.onTapGesture {
+							self.nodeHistory.toggle()
+							UserDefaults.enableMapNodeHistoryPins = self.nodeHistory
+						}
+						Toggle(isOn: $routeLines) {
+							Label("Route Lines", systemImage: "road.lanes")
+						}
+						.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+						.onTapGesture {
+							self.routeLines.toggle()
+							UserDefaults.enableMapRouteLines = self.routeLines
+						}
 					}
 					Toggle(isOn: $convexHull) {
 						Label("Convex Hull", systemImage: "button.angledbottom.horizontal.right")
diff --git a/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift b/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
index 23eca04b..40dd5271 100644
--- a/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
+++ b/Meshtastic/Views/Nodes/Helpers/Map/NodeMapSwiftUI.swift
@@ -38,6 +38,7 @@ struct NodeMapSwiftUI: View {
 	@State var selectedPosition: PositionEntity?
 	@State var showWaypoints = false
 	@State var selectedWaypoint: WaypointEntity?
+	@State var isMeshMap = false
 	
 	@FetchRequest(sortDescriptors: [NSSortDescriptor(key: "name", ascending: false)],
 				  predicate: NSPredicate(
@@ -207,7 +208,7 @@ struct NodeMapSwiftUI: View {
 							.padding()
 					}
 					.sheet(isPresented: $isEditingSettings) {
-						MapSettingsForm(nodeHistory: $showNodeHistory, routeLines: $showRouteLines, convexHull: $showConvexHull, traffic: $showTraffic, pointsOfInterest: $showPointsOfInterest, mapLayer: $selectedMapLayer)
+						MapSettingsForm(nodeHistory: $showNodeHistory, routeLines: $showRouteLines, convexHull: $showConvexHull, traffic: $showTraffic, pointsOfInterest: $showPointsOfInterest, mapLayer: $selectedMapLayer, meshMap: $isMeshMap)
 							.onChange(of: (selectedMapLayer)) { newMapLayer in
 								switch selectedMapLayer {
 								case .standard:
diff --git a/Meshtastic/Views/Nodes/MeshMap.swift b/Meshtastic/Views/Nodes/MeshMap.swift
index dfed0c38..5263bc37 100644
--- a/Meshtastic/Views/Nodes/MeshMap.swift
+++ b/Meshtastic/Views/Nodes/MeshMap.swift
@@ -40,6 +40,7 @@ struct MeshMap: View {
 	@State var editingWaypoint: WaypointEntity?
 	@State var selectedWaypoint: WaypointEntity?
 	@State var newWaypointCoord :CLLocationCoordinate2D?
+	@State var isMeshMap = true
 	
 	var delay: Double = 0
 	@State private var scale: CGFloat = 0.5
@@ -147,54 +148,6 @@ struct MeshMap: View {
 									.stroke(Color(UIColor(hex: UInt32(route.color))), style: solid)
 								
 							}
-							/// Node Route Lines
-							if showRouteLines {
-								let nodePositions = Array(position.nodePosition!.positions!) as! [PositionEntity]
-								let routeCoords = nodePositions.compactMap({(pos) -> CLLocationCoordinate2D in
-									return pos.nodeCoordinate ?? LocationHelper.DefaultLocation
-								})
-								let gradient = LinearGradient(
-									colors: [Color(nodeColor.lighter().lighter()), Color(nodeColor.lighter()), Color(nodeColor)],
-									startPoint: .leading, endPoint: .trailing
-								)
-								let dashed = StrokeStyle(
-									lineWidth: 3,
-									lineCap: .round, lineJoin: .round, dash: [10, 10]
-								)
-								MapPolyline(coordinates: routeCoords)
-									.stroke(gradient, style: dashed)
-							}
-							/// Node History
-							ForEach(Array(position.nodePosition!.positions!) as! [PositionEntity], id: \.self) { (mappin: PositionEntity) in
-								if showNodeHistory {
-										if mappin.latest == false && mappin.nodePosition?.user?.vip ?? false {
-											let pf = PositionFlags(rawValue: Int(mappin.nodePosition?.metadata?.positionFlags ?? 771))
-											let headingDegrees = Angle.degrees(Double(mappin.heading))
-											Annotation("", coordinate: mappin.coordinate) {
-												LazyVStack {
-													if pf.contains(.Heading) {
-														Image(systemName: "location.north.circle")
-															.resizable()
-															.scaledToFit()
-															.foregroundStyle(Color(UIColor(hex: UInt32(mappin.nodePosition?.num ?? 0))).isLight() ? .black : .white)
-															.background(Color(UIColor(hex: UInt32(mappin.nodePosition?.num ?? 0))))
-															.clipShape(Circle())
-															.rotationEffect(headingDegrees)
-															.frame(width: 16, height: 16)
-														
-													} else {
-														Circle()
-															.fill(Color(UIColor(hex: UInt32(mappin.nodePosition?.num ?? 0))))
-															.strokeBorder(Color(UIColor(hex: UInt32(mappin.nodePosition?.num ?? 0))).isLight() ? .black : .white ,lineWidth: 2)
-															.frame(width: 12, height: 12)
-													}
-												}
-											}
-											.annotationTitles(.hidden)
-											.annotationSubtitles(.hidden)
-										}
-								}
-							}
 						}
 						
 						/// Waypoint Annotations
@@ -216,8 +169,6 @@ struct MeshMap: View {
 					.mapControls {
 						MapScaleView(scope: mapScope)
 							.mapControlVisibility(.automatic)
-						MapUserLocationButton(scope: mapScope)
-							.mapControlVisibility(showUserLocation ? .visible : .hidden)
 						MapPitchToggle(scope: mapScope)
 							.mapControlVisibility(.automatic)
 						MapCompass(scope: mapScope)
@@ -253,7 +204,7 @@ struct MeshMap: View {
 					.padding()
 			}
 			.sheet(isPresented: $isEditingSettings) {
-				MapSettingsForm(nodeHistory: $showNodeHistory, routeLines: $showRouteLines, convexHull: $showConvexHull, traffic: $showTraffic, pointsOfInterest: $showPointsOfInterest, mapLayer: $selectedMapLayer)
+				MapSettingsForm(nodeHistory: $showNodeHistory, routeLines: $showRouteLines, convexHull: $showConvexHull, traffic: $showTraffic, pointsOfInterest: $showPointsOfInterest, mapLayer: $selectedMapLayer, meshMap: $isMeshMap)
 			}
 			.onChange(of: (appState.navigationPath)) { newPath in