diff --git a/Meshtastic Client.xcodeproj/project.pbxproj b/Meshtastic Client.xcodeproj/project.pbxproj
index b1df5a64..f3d67173 100644
--- a/Meshtastic Client.xcodeproj/project.pbxproj	
+++ b/Meshtastic Client.xcodeproj/project.pbxproj	
@@ -641,7 +641,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.17;
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -668,7 +668,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.17;
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
diff --git a/MeshtasticClient/Helpers/BLEManager.swift b/MeshtasticClient/Helpers/BLEManager.swift
index 2797a3bb..6276b65e 100644
--- a/MeshtasticClient/Helpers/BLEManager.swift
+++ b/MeshtasticClient/Helpers/BLEManager.swift
@@ -401,7 +401,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
                     }
                 }
                 
-                if decodedInfo.nodeInfo.num != 0
+            if decodedInfo.nodeInfo.num != 0 && decodedInfo.nodeInfo.user.longName.lengthOfBytes(using: .utf8) > 0
                 {
                     print("Save a nodeInfo")
                     do {
diff --git a/MeshtasticClient/Views/ContentView.swift b/MeshtasticClient/Views/ContentView.swift
index 3c5b27f1..6e0d8e8c 100644
--- a/MeshtasticClient/Views/ContentView.swift
+++ b/MeshtasticClient/Views/ContentView.swift
@@ -5,7 +5,7 @@ Abstract: Default App View
 import SwiftUI
 
 struct ContentView: View {
-    @State private var selection: Tab = .messages
+    @State private var selection: Tab = .nodes
 
     enum Tab {
         case messages
@@ -17,12 +17,12 @@ struct ContentView: View {
     var body: some View {
         
         TabView(selection: $selection) {
-            Channels()
-                .tabItem {
-                    Label("Messages", systemImage: "text.bubble")
-                        .symbolRenderingMode(.hierarchical)
-                }
-                .tag(Tab.messages)
+            //Channels()
+            //    .tabItem {
+            //        Label("Messages", systemImage: "text.bubble")
+            //            .symbolRenderingMode(.hierarchical)
+           //     }
+            //    .tag(Tab.messages)
             NodeList()
                 .tabItem {
                     Label("Nodes", systemImage: "flipphone")