diff --git a/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift b/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
index 54aa5b29..7ab6c7a6 100644
--- a/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
+++ b/Meshtastic/Views/Nodes/Helpers/Map/WaypointForm.swift
@@ -187,7 +187,7 @@ struct WaypointForm: View {
 					.controlSize(.regular)
 					.padding(.bottom)
 					
-					if waypoint.id > 0 {
+					if waypoint.id > 0 && bleManager.isConnected {
 						
 						Menu {
 							Button("For me", action: {
diff --git a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
index 0b381b9c..c3c877f2 100644
--- a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
+++ b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift
@@ -79,5 +79,12 @@ struct NodeInfoItem: View {
 			}
 		}
 		Divider()
+		if node.metadata != nil {
+			HStack(alignment: .center) {
+				Text("firmware.version").font(.title2)+Text(": \(node.metadata?.firmwareVersion ?? "unknown".localized)")
+					.font(.title3).foregroundColor(Color.gray)
+			}
+			Divider()
+		}
 	}
 }