diff --git a/MeshtasticApple/Helpers/BLEManager.swift b/MeshtasticApple/Helpers/BLEManager.swift
index 46dbca57..00488f53 100644
--- a/MeshtasticApple/Helpers/BLEManager.swift
+++ b/MeshtasticApple/Helpers/BLEManager.swift
@@ -179,7 +179,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
             peripheralName = name
         }
 
-		let newPeripheral = Peripheral(id: peripheral.identifier.uuidString, num: 0, name: peripheralName, shortName: String(peripheralName.suffix(3)), longName: peripheralName, lastFourCode: last4Code, firmwareVersion: "Unknown", rssi: RSSI.intValue, bitrate: nil, channelUtilization: nil, airTime: nil, lastUpdate: Date(), subscribed: false, peripheral: peripheral)
+		let newPeripheral = Peripheral(id: peripheral.identifier.uuidString, num: 0, name: peripheralName, shortName: last4Code, longName: peripheralName, lastFourCode: last4Code, firmwareVersion: "Unknown", rssi: RSSI.intValue, bitrate: nil, channelUtilization: nil, airTime: nil, lastUpdate: Date(), subscribed: false, peripheral: peripheral)
 		let peripheralIndex = peripherals.firstIndex(where: { $0.id == newPeripheral.id })
 
 		if peripheralIndex != nil && newPeripheral.peripheral.state != CBPeripheralState.connected {
@@ -409,6 +409,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 							lastConnnectionVersion = myInfo?.firmwareVersion ??  myInfo!.firmwareVersion ?? "Unknown"
 							self.connectedPeripheral.firmwareVersion = myInfo!.firmwareVersion ?? "Unknown"
 							self.connectedPeripheral.name = myInfo!.bleName ?? "Unknown"
+							
 						}
 						
 					} else if decodedInfo.nodeInfo.num != 0 {
@@ -425,6 +426,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 								if nodeInfo!.user != nil {
 									
 									connectedPeripheral.name  = nodeInfo!.user!.longName ?? "Unknown"
+									connectedPeripheral.shortName = nodeInfo!.user!.shortName ?? "?????"
 								}
 							}
 						}
@@ -432,7 +434,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 					} else if decodedInfo.config.isInitialized {
 							
 						//localConfig(config: decodedInfo.config, meshlogging: meshLoggingEnabled, context: context!, nodeLongName: self.connectedPeripheral.longName)
-						if meshLoggingEnabled { MeshLogger.log("ℹ️ MESH PACKET received for Unknown App UNHANDLED \(try! decodedInfo.config.jsonString())") }
+						if meshLoggingEnabled { MeshLogger.log("ℹ️ MESH PACKET received for Unknown App decodedInfo.config.isInitialized \(try! decodedInfo.packet.jsonString())") }
 						
 					} else {
 						
@@ -809,26 +811,60 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
 		return false
 	}
 	
-	public func getConfig(destNum: Int64,  wantResponse: Bool) -> Bool {
+	public func sendFactoryReset(destNum: Int64,  wantResponse: Bool) -> Bool {
+		
+		var deviceConfig = Config.DeviceConfig()
+		deviceConfig.factoryReset = true
 		
 		var adminPacket = AdminMessage()
-		adminPacket.getConfigRequest = AdminMessage.ConfigType.deviceConfig
-
-		adminPacket.variant = AdminMessage.OneOf_Variant.getConfigRequest(AdminMessage.ConfigType.loraConfig)
-
+		adminPacket.setConfig.device = deviceConfig
 		
 		var meshPacket: MeshPacket = MeshPacket()
 		meshPacket.to = UInt32(connectedPeripheral.num)
-		meshPacket.from	= UInt32(connectedPeripheral.num)
+		meshPacket.from	= 0 //UInt32(connectedPeripheral.num)
 		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
 		meshPacket.priority =  MeshPacket.Priority.reliable
-		meshPacket.wantAck = false
+		meshPacket.wantAck = wantResponse
+		meshPacket.hopLimit = 0
+		
+		var dataMessage = DataMessage()
+		dataMessage.payload = try! adminPacket.serializedData()
+		dataMessage.portnum = PortNum.adminApp
+		
+		meshPacket.decoded = dataMessage
+
+		var toRadio: ToRadio!
+		toRadio = ToRadio()
+		toRadio.packet = meshPacket
+
+		let binaryData: Data = try! toRadio.serializedData()
+		
+		if connectedPeripheral!.peripheral.state == CBPeripheralState.connected {
+			
+			connectedPeripheral.peripheral.writeValue(binaryData, for: TORADIO_characteristic, type: .withResponse)
+			
+			return true
+		}
+		
+		return false
+	}
+	
+	public func saveLoRaConfig(config: Config.LoRaConfig,  destNum: Int64,  wantResponse: Bool) -> Bool {
+		
+		var adminPacket = AdminMessage()
+		adminPacket.setConfig.lora = config
+		
+		var meshPacket: MeshPacket = MeshPacket()
+		meshPacket.to = UInt32(connectedPeripheral.num)
+		meshPacket.from	= 0 //UInt32(connectedPeripheral.num)
+		meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
+		meshPacket.priority =  MeshPacket.Priority.reliable
+		meshPacket.wantAck = wantResponse
 		meshPacket.hopLimit = 0
 		
 		var dataMessage = DataMessage()
 		dataMessage.payload = try! adminPacket.serializedData()
 		dataMessage.portnum = PortNum.adminApp
-		dataMessage.wantResponse = true
 		
 		meshPacket.decoded = dataMessage
 
diff --git a/MeshtasticApple/Views/Helpers/ConnectedDevice.swift b/MeshtasticApple/Views/Helpers/ConnectedDevice.swift
index 4d73f9de..e3552229 100644
--- a/MeshtasticApple/Views/Helpers/ConnectedDevice.swift
+++ b/MeshtasticApple/Views/Helpers/ConnectedDevice.swift
@@ -17,10 +17,10 @@ struct ConnectedDevice: View {
             if bluetoothOn {
                 if deviceConnected {
                     Image(systemName: "antenna.radiowaves.left.and.right.circle.fill")
-                        .imageScale(.large)
+						.imageScale(.large)
                         .foregroundColor(.green)
                         .symbolRenderingMode(.hierarchical)
-                    Text(name!).font(.subheadline).foregroundColor(.gray)
+					Text(name!).font(.callout).foregroundColor(.gray)
                 } else {
 
                     Image(systemName: "antenna.radiowaves.left.and.right.slash")
diff --git a/MeshtasticApple/Views/Settings/DeviceConfig.swift b/MeshtasticApple/Views/Settings/DeviceConfig.swift
index 148c42bb..bff27d04 100644
--- a/MeshtasticApple/Views/Settings/DeviceConfig.swift
+++ b/MeshtasticApple/Views/Settings/DeviceConfig.swift
@@ -41,39 +41,69 @@ struct DeviceConfig: View {
 	@State var serialEnabled = true
 	@State var debugLogEnabled = false
 	
+	@State private var isPresentingFactoryResetConfirm: Bool = false
+	
 	var body: some View {
 		
-		VStack {
+		ZStack {
+			
+			VStack {
 
-			Form {
-				
-				Section(header: Text("Options")) {
+				Form {
 					
-					Picker("Device Role", selection: $deviceRole ) {
-						ForEach(DeviceRoles.allCases) { dr in
-							Text(dr.description)
+					
+					Section(header: Text("Options")) {
+						
+						Picker("Device Role", selection: $deviceRole ) {
+							ForEach(DeviceRoles.allCases) { dr in
+								Text(dr.description)
+							}
+						}
+						.pickerStyle(InlinePickerStyle())
+						.padding(.top, 10)
+						.padding(.bottom, 10)
+					}
+					
+					Section(header: Text("Debug")) {
+						
+						Toggle(isOn: $serialEnabled) {
+
+							Label("Serial Console", systemImage: "terminal")
+						}
+						.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+						
+						Toggle(isOn: $debugLogEnabled) {
+
+							Label("Debug Log", systemImage: "ant.fill")
+						}
+						.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+					}
+				}
+				
+				Button("Factory Reset", role: .destructive) {
+					
+					isPresentingFactoryResetConfirm = true
+				}
+				.disabled(bleManager.connectedPeripheral == nil)
+				.buttonStyle(.bordered)
+				.buttonBorderShape(.capsule)
+				.controlSize(.large)
+				.padding()
+				.confirmationDialog(
+					"Are you sure?",
+					isPresented: $isPresentingFactoryResetConfirm
+				) {
+					Button("Erase all device settings?", role: .destructive) {
+						
+						if !bleManager.sendFactoryReset(destNum: bleManager.connectedPeripheral.num, wantResponse: false) {
+							
+							print("Factory Reset Failed")
 						}
 					}
-					.pickerStyle(InlinePickerStyle())
-					.padding(.top, 10)
-					.padding(.bottom, 10)
-				}
-				
-				Section(header: Text("Debug")) {
-					
-					Toggle(isOn: $serialEnabled) {
-
-						Label("Serial Console", systemImage: "terminal")
-					}
-					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-					
-					Toggle(isOn: $debugLogEnabled) {
-
-						Label("Debug Log", systemImage: "ant.fill")
-					}
-					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
 				}
+				Spacer()
 			}
+			
 			.navigationTitle("Device Config")
 			.navigationBarItems(trailing: