diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp
index 810ce6afb..66119ebcc 100644
--- a/soh/soh/Network/Archipelago/Archipelago.cpp
+++ b/soh/soh/Network/Archipelago/Archipelago.cpp
@@ -186,7 +186,7 @@ const std::vector<ArchipelagoClient::ApItem>& ArchipelagoClient::get_scouted_ite
 
 const char* ArchipelagoClient::get_connection_status() {
     if (!apclient) {
-        return "No status available";
+        return "";
     }
 
     APClient::State clientStatus = apclient->get_state();
@@ -194,25 +194,20 @@ const char* ArchipelagoClient::get_connection_status() {
     switch (clientStatus) { 
         case APClient::State::DISCONNECTED: {
             return "Disconnected!";
-            break;
         }
         case APClient::State::SOCKET_CONNECTING: {
             return "Socket Connecting!";
-            break;
         }
         case APClient::State::SOCKET_CONNECTED: {
             return "Socket Connected!";
-            break;
         }
         case APClient::State::ROOM_INFO: {
             return "Room info Recieved!";
-            break;
         }
         case APClient::State::SLOT_CONNECTED: {
             return "Slot Connected!";
-            break;
         }
         default:
-            return "Unknown Status";
+            return "";
     }
 }
diff --git a/soh/soh/SohGui/SohMenuNetwork.cpp b/soh/soh/SohGui/SohMenuNetwork.cpp
index 637c78285..6ab289e7d 100644
--- a/soh/soh/SohGui/SohMenuNetwork.cpp
+++ b/soh/soh/SohGui/SohMenuNetwork.cpp
@@ -15,8 +15,17 @@ void SohMenu::AddMenuNetwork() {
     // Add Network Menu
     AddMenuEntry("Network", CVAR_SETTING("Menu.NetworkSidebarSection"));
 
+    // Archipelago
+    WidgetPath path = { "Network", "Archipelago", SECTION_COLUMN_1 };
+    AddSidebarEntry("Network", path.sidebarName, 1);
+    AddWidget(path, "Popout Archipelago Settings Window", WIDGET_WINDOW_BUTTON)
+        .CVar(CVAR_WINDOW("ArchipelagoSettings"))
+        .RaceDisable(false)
+        .WindowName("Archipelago Settings")
+        .Options(WindowButtonOptions().Tooltip("Enables the Archipelago Settings Window."));
+
     // Sail
-    WidgetPath path = { "Network", "Sail", SECTION_COLUMN_1 };
+    path.sidebarName = "Sail";
     AddSidebarEntry("Network", path.sidebarName, 3);
 
     AddWidget(path,
diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp
index bad83a7ee..8f4e6e43b 100644
--- a/soh/soh/SohGui/SohMenuRandomizer.cpp
+++ b/soh/soh/SohGui/SohMenuRandomizer.cpp
@@ -100,15 +100,6 @@ void SohMenu::AddMenuRandomizer() {
         .WindowName("Plandomizer Editor")
         .Options(WindowButtonOptions().Tooltip("Enables the separate Randomizer Settings Window."));
 
-    // Archipelago
-    path.sidebarName = "Archipelago";
-    AddSidebarEntry("Randomizer", path.sidebarName, 1);
-    AddWidget(path, "Popout Archipelago Settings Window", WIDGET_WINDOW_BUTTON)
-        .CVar(CVAR_WINDOW("ArchipelagoSettings"))
-        .RaceDisable(false)
-        .WindowName("Archipelago Settings")
-        .Options(WindowButtonOptions().Tooltip("Enables the Archipelago Settings Window."));
-
     // Item Tracker
     path.sidebarName = "Item Tracker";
     AddSidebarEntry("Randomizer", path.sidebarName, 1);