diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index 2225db8b4..60b261b8b 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -480,12 +480,8 @@ void menuHandler::positionBaseMenu()
     if (accelerometerThread) {
         optionsArray[options] = "Compass Calibrate";
         optionsEnumArray[options++] = CompassCalibrate;
-    } else
-#endif
-    {
-        bannerOptions.optionsArrayPtr = optionsArray;
-        options = 3;
     }
+#endif
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Position Action";
     bannerOptions.optionsArrayPtr = optionsArray;
@@ -502,712 +498,707 @@ void menuHandler::positionBaseMenu()
         } else if (selected == CompassCalibrate) {
             accelerometerThread->calibrate(30);
 #endif
-            else
-            {
-                menuQueue = menu_none;
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void
-    menuHandler::nodeListMenu()
-    {
-        enum optionsNumbers { Back, Favorite, TraceRoute, Verify, Reset, enumEnd };
-        static const char *optionsArray[] = {"Back", "Add Favorite", "Trace Route", "Key Verification", "Reset NodeDB"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Node Action";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 5;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == Favorite) {
-                menuQueue = add_favorite;
-                screen->runNow();
-            } else if (selected == Verify) {
-                menuQueue = key_verification_init;
-                screen->runNow();
-            } else if (selected == Reset) {
-                menuQueue = reset_node_db_menu;
-                screen->runNow();
-            } else if (selected == TraceRoute) {
-                menuQueue = trace_route_menu;
-                screen->runNow();
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+void menuHandler::nodeListMenu()
+{
+    enum optionsNumbers { Back, Favorite, TraceRoute, Verify, Reset, enumEnd };
+    static const char *optionsArray[] = {"Back", "Add Favorite", "Trace Route", "Key Verification", "Reset NodeDB"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Node Action";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 5;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Favorite) {
+            menuQueue = add_favorite;
+            screen->runNow();
+        } else if (selected == Verify) {
+            menuQueue = key_verification_init;
+            screen->runNow();
+        } else if (selected == Reset) {
+            menuQueue = reset_node_db_menu;
+            screen->runNow();
+        } else if (selected == TraceRoute) {
+            menuQueue = trace_route_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::resetNodeDBMenu()
-    {
-        static const char *optionsArray[] = {"Back", "Confirm"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Confirm Reset NodeDB";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                disableBluetooth();
-                LOG_INFO("Initiate node-db reset");
-                nodeDB->resetNodes();
-                rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+void menuHandler::resetNodeDBMenu()
+{
+    static const char *optionsArray[] = {"Back", "Confirm"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Confirm Reset NodeDB";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            disableBluetooth();
+            LOG_INFO("Initiate node-db reset");
+            nodeDB->resetNodes();
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::compassNorthMenu()
-    {
-        enum optionsNumbers { Back, Dynamic, Fixed, Freeze };
-        static const char *optionsArray[] = {"Back", "Dynamic", "Fixed Ring", "Freeze Heading"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "North Directions?";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 4;
-        bannerOptions.InitialSelected = uiconfig.compass_mode + 1;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == Dynamic) {
-                if (uiconfig.compass_mode != meshtastic_CompassMode_DYNAMIC) {
-                    uiconfig.compass_mode = meshtastic_CompassMode_DYNAMIC;
-                    saveUIConfig();
-                    screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-                }
-            } else if (selected == Fixed) {
-                if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING) {
-                    uiconfig.compass_mode = meshtastic_CompassMode_FIXED_RING;
-                    saveUIConfig();
-                    screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-                }
-            } else if (selected == Freeze) {
-                if (uiconfig.compass_mode != meshtastic_CompassMode_FREEZE_HEADING) {
-                    uiconfig.compass_mode = meshtastic_CompassMode_FREEZE_HEADING;
-                    saveUIConfig();
-                    screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-                }
-            } else if (selected == Back) {
-                menuQueue = position_base_menu;
-                screen->runNow();
+void menuHandler::compassNorthMenu()
+{
+    enum optionsNumbers { Back, Dynamic, Fixed, Freeze };
+    static const char *optionsArray[] = {"Back", "Dynamic", "Fixed Ring", "Freeze Heading"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "North Directions?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 4;
+    bannerOptions.InitialSelected = uiconfig.compass_mode + 1;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Dynamic) {
+            if (uiconfig.compass_mode != meshtastic_CompassMode_DYNAMIC) {
+                uiconfig.compass_mode = meshtastic_CompassMode_DYNAMIC;
+                saveUIConfig();
+                screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
             }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+        } else if (selected == Fixed) {
+            if (uiconfig.compass_mode != meshtastic_CompassMode_FIXED_RING) {
+                uiconfig.compass_mode = meshtastic_CompassMode_FIXED_RING;
+                saveUIConfig();
+                screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
+            }
+        } else if (selected == Freeze) {
+            if (uiconfig.compass_mode != meshtastic_CompassMode_FREEZE_HEADING) {
+                uiconfig.compass_mode = meshtastic_CompassMode_FREEZE_HEADING;
+                saveUIConfig();
+                screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
+            }
+        } else if (selected == Back) {
+            menuQueue = position_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
 #if !MESHTASTIC_EXCLUDE_GPS
-    void menuHandler::GPSToggleMenu()
-    {
+void menuHandler::GPSToggleMenu()
+{
 
-        static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Toggle GPS";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 3;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
-                playGPSEnableBeep();
-                gps->enable();
-                service->reloadConfig(SEGMENT_CONFIG);
-            } else if (selected == 2) {
-                config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
-                playGPSDisableBeep();
-                gps->disable();
-                service->reloadConfig(SEGMENT_CONFIG);
-            } else {
-                menuQueue = position_base_menu;
-                screen->runNow();
-            }
-        };
-        bannerOptions.InitialSelected = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED ? 1 : 2;
-        screen->showOverlayBanner(bannerOptions);
-    }
-#endif
-
-    void menuHandler::BluetoothToggleMenu()
-    {
-        static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Toggle Bluetooth";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 3;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1 || selected == 2) {
-                InputEvent event = {.inputEvent = (input_broker_event)170, .kbchar = 170, .touchX = 0, .touchY = 0};
-                inputBroker->injectInputEvent(&event);
-            }
-        };
-        bannerOptions.InitialSelected = config.bluetooth.enabled ? 1 : 2;
-        screen->showOverlayBanner(bannerOptions);
-    }
-
-    void menuHandler::BuzzerModeMenu()
-    {
-        static const char *optionsArray[] = {"All Enabled", "Disabled", "Notifications", "System Only"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Buzzer Mode";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 4;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            config.device.buzzer_mode = (meshtastic_Config_DeviceConfig_BuzzerMode)selected;
+    static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Toggle GPS";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 3;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
+            playGPSEnableBeep();
+            gps->enable();
+            service->reloadConfig(SEGMENT_CONFIG);
+        } else if (selected == 2) {
+            config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
+            playGPSDisableBeep();
+            gps->disable();
             service->reloadConfig(SEGMENT_CONFIG);
-        };
-        bannerOptions.InitialSelected = config.device.buzzer_mode;
-        screen->showOverlayBanner(bannerOptions);
-    }
-
-    void menuHandler::BrightnessPickerMenu()
-    {
-        static const char *optionsArray[] = {"Back", "Low", "Medium", "High"};
-
-        // Get current brightness level to set initial selection
-        int currentSelection = 1; // Default to Medium
-        if (uiconfig.screen_brightness >= 255) {
-            currentSelection = 3; // Very High
-        } else if (uiconfig.screen_brightness >= 128) {
-            currentSelection = 2; // High
         } else {
-            currentSelection = 1; // Medium
+            menuQueue = position_base_menu;
+            screen->runNow();
+        }
+    };
+    bannerOptions.InitialSelected = config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED ? 1 : 2;
+    screen->showOverlayBanner(bannerOptions);
+}
+#endif
+
+void menuHandler::BluetoothToggleMenu()
+{
+    static const char *optionsArray[] = {"Back", "Enabled", "Disabled"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Toggle Bluetooth";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 3;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1 || selected == 2) {
+            InputEvent event = {.inputEvent = (input_broker_event)170, .kbchar = 170, .touchX = 0, .touchY = 0};
+            inputBroker->injectInputEvent(&event);
+        }
+    };
+    bannerOptions.InitialSelected = config.bluetooth.enabled ? 1 : 2;
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::BuzzerModeMenu()
+{
+    static const char *optionsArray[] = {"All Enabled", "Disabled", "Notifications", "System Only"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Buzzer Mode";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 4;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        config.device.buzzer_mode = (meshtastic_Config_DeviceConfig_BuzzerMode)selected;
+        service->reloadConfig(SEGMENT_CONFIG);
+    };
+    bannerOptions.InitialSelected = config.device.buzzer_mode;
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::BrightnessPickerMenu()
+{
+    static const char *optionsArray[] = {"Back", "Low", "Medium", "High"};
+
+    // Get current brightness level to set initial selection
+    int currentSelection = 1; // Default to Medium
+    if (uiconfig.screen_brightness >= 255) {
+        currentSelection = 3; // Very High
+    } else if (uiconfig.screen_brightness >= 128) {
+        currentSelection = 2; // High
+    } else {
+        currentSelection = 1; // Medium
+    }
+
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Brightness";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 4;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) { // Medium
+            uiconfig.screen_brightness = 64;
+        } else if (selected == 2) { // High
+            uiconfig.screen_brightness = 128;
+        } else if (selected == 3) { // Very High
+            uiconfig.screen_brightness = 255;
         }
 
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Brightness";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 4;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) { // Medium
-                uiconfig.screen_brightness = 64;
-            } else if (selected == 2) { // High
-                uiconfig.screen_brightness = 128;
-            } else if (selected == 3) { // Very High
-                uiconfig.screen_brightness = 255;
-            }
-
-            if (selected != 0) { // Not "Back"
-                                 // Apply brightness immediately
+        if (selected != 0) { // Not "Back"
+                             // Apply brightness immediately
 #if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190)
-                // For HELTEC devices, use analogWrite to control backlight
-                analogWrite(VTFT_LEDA, uiconfig.screen_brightness);
+            // For HELTEC devices, use analogWrite to control backlight
+            analogWrite(VTFT_LEDA, uiconfig.screen_brightness);
 #elif defined(ST7789_CS)
-                static_cast<TFTDisplay *>(screen->getDisplayDevice())->setDisplayBrightness(uiconfig.screen_brightness);
+            static_cast<TFTDisplay *>(screen->getDisplayDevice())->setDisplayBrightness(uiconfig.screen_brightness);
 #elif defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107)
-                screen->getDisplayDevice()->setBrightness(uiconfig.screen_brightness);
+            screen->getDisplayDevice()->setBrightness(uiconfig.screen_brightness);
 #endif
 
-                // Save to device
-                saveUIConfig();
+            // Save to device
+            saveUIConfig();
 
-                LOG_INFO("Screen brightness set to %d", uiconfig.screen_brightness);
-            }
-        };
-        bannerOptions.InitialSelected = currentSelection;
-        screen->showOverlayBanner(bannerOptions);
-    }
+            LOG_INFO("Screen brightness set to %d", uiconfig.screen_brightness);
+        }
+    };
+    bannerOptions.InitialSelected = currentSelection;
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::switchToMUIMenu()
-    {
-        static const char *optionsArray[] = {"No", "Yes"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Switch to MUI?";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                config.display.displaymode = meshtastic_Config_DisplayConfig_DisplayMode_COLOR;
-                config.bluetooth.enabled = false;
-                service->reloadConfig(SEGMENT_CONFIG);
-                rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+void menuHandler::switchToMUIMenu()
+{
+    static const char *optionsArray[] = {"No", "Yes"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Switch to MUI?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            config.display.displaymode = meshtastic_Config_DisplayConfig_DisplayMode_COLOR;
+            config.bluetooth.enabled = false;
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::TFTColorPickerMenu(OLEDDisplay * display)
-    {
-        static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
-                                             "Pink", "White"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Select Screen Color";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 10;
-        bannerOptions.bannerCallback = [display](int selected) -> void {
+void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
+{
+    static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
+                                         "Pink", "White"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Select Screen Color";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 10;
+    bannerOptions.bannerCallback = [display](int selected) -> void {
 #if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
-            uint8_t TFT_MESH_r = 0;
-            uint8_t TFT_MESH_g = 0;
-            uint8_t TFT_MESH_b = 0;
-            if (selected == 1) {
-                LOG_INFO("Setting color to system default or defined variant");
-                // Given just before we set all these to zero, we will allow this to go through
-            } else if (selected == 2) {
-                LOG_INFO("Setting color to Meshtastic Green");
-                TFT_MESH_r = 103;
-                TFT_MESH_g = 234;
-                TFT_MESH_b = 148;
-            } else if (selected == 3) {
-                LOG_INFO("Setting color to Yellow");
-                TFT_MESH_r = 255;
-                TFT_MESH_g = 255;
-                TFT_MESH_b = 128;
-            } else if (selected == 4) {
-                LOG_INFO("Setting color to Red");
-                TFT_MESH_r = 255;
-                TFT_MESH_g = 64;
-                TFT_MESH_b = 64;
-            } else if (selected == 5) {
-                LOG_INFO("Setting color to Orange");
-                TFT_MESH_r = 255;
-                TFT_MESH_g = 160;
-                TFT_MESH_b = 20;
-            } else if (selected == 6) {
-                LOG_INFO("Setting color to Purple");
-                TFT_MESH_r = 204;
-                TFT_MESH_g = 153;
-                TFT_MESH_b = 255;
-            } else if (selected == 7) {
-                LOG_INFO("Setting color to Teal");
-                TFT_MESH_r = 64;
-                TFT_MESH_g = 224;
-                TFT_MESH_b = 208;
-            } else if (selected == 8) {
-                LOG_INFO("Setting color to Pink");
-                TFT_MESH_r = 255;
-                TFT_MESH_g = 105;
-                TFT_MESH_b = 180;
-            } else if (selected == 9) {
-                LOG_INFO("Setting color to White");
-                TFT_MESH_r = 255;
-                TFT_MESH_g = 255;
-                TFT_MESH_b = 255;
-            } else {
-                menuQueue = system_base_menu;
-                screen->runNow();
-            }
+        uint8_t TFT_MESH_r = 0;
+        uint8_t TFT_MESH_g = 0;
+        uint8_t TFT_MESH_b = 0;
+        if (selected == 1) {
+            LOG_INFO("Setting color to system default or defined variant");
+            // Given just before we set all these to zero, we will allow this to go through
+        } else if (selected == 2) {
+            LOG_INFO("Setting color to Meshtastic Green");
+            TFT_MESH_r = 103;
+            TFT_MESH_g = 234;
+            TFT_MESH_b = 148;
+        } else if (selected == 3) {
+            LOG_INFO("Setting color to Yellow");
+            TFT_MESH_r = 255;
+            TFT_MESH_g = 255;
+            TFT_MESH_b = 128;
+        } else if (selected == 4) {
+            LOG_INFO("Setting color to Red");
+            TFT_MESH_r = 255;
+            TFT_MESH_g = 64;
+            TFT_MESH_b = 64;
+        } else if (selected == 5) {
+            LOG_INFO("Setting color to Orange");
+            TFT_MESH_r = 255;
+            TFT_MESH_g = 160;
+            TFT_MESH_b = 20;
+        } else if (selected == 6) {
+            LOG_INFO("Setting color to Purple");
+            TFT_MESH_r = 204;
+            TFT_MESH_g = 153;
+            TFT_MESH_b = 255;
+        } else if (selected == 7) {
+            LOG_INFO("Setting color to Teal");
+            TFT_MESH_r = 64;
+            TFT_MESH_g = 224;
+            TFT_MESH_b = 208;
+        } else if (selected == 8) {
+            LOG_INFO("Setting color to Pink");
+            TFT_MESH_r = 255;
+            TFT_MESH_g = 105;
+            TFT_MESH_b = 180;
+        } else if (selected == 9) {
+            LOG_INFO("Setting color to White");
+            TFT_MESH_r = 255;
+            TFT_MESH_g = 255;
+            TFT_MESH_b = 255;
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
 
-            if (selected != 0) {
-                display->setColor(BLACK);
-                display->fillRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
-                display->setColor(WHITE);
+        if (selected != 0) {
+            display->setColor(BLACK);
+            display->fillRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+            display->setColor(WHITE);
 
-                if (TFT_MESH_r == 0 && TFT_MESH_g == 0 && TFT_MESH_b == 0) {
+            if (TFT_MESH_r == 0 && TFT_MESH_g == 0 && TFT_MESH_b == 0) {
 #ifdef TFT_MESH_OVERRIDE
-                    TFT_MESH = TFT_MESH_OVERRIDE;
+                TFT_MESH = TFT_MESH_OVERRIDE;
 #else
-                    TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
+                TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
 #endif
-                } else {
-                    TFT_MESH = COLOR565(TFT_MESH_r, TFT_MESH_g, TFT_MESH_b);
-                }
+            } else {
+                TFT_MESH = COLOR565(TFT_MESH_r, TFT_MESH_g, TFT_MESH_b);
+            }
 
 #if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190)
-                static_cast<ST7789Spi *>(screen->getDisplayDevice())->setRGB(TFT_MESH);
+            static_cast<ST7789Spi *>(screen->getDisplayDevice())->setRGB(TFT_MESH);
 #endif
 
-                screen->setFrames(graphics::Screen::FOCUS_SYSTEM);
-                if (TFT_MESH_r == 0 && TFT_MESH_g == 0 && TFT_MESH_b == 0) {
-                    uiconfig.screen_rgb_color = 0;
-                } else {
-                    uiconfig.screen_rgb_color = (TFT_MESH_r << 16) | (TFT_MESH_g << 8) | TFT_MESH_b;
-                }
-                LOG_INFO("Storing Value of %d to uiconfig.screen_rgb_color", uiconfig.screen_rgb_color);
-                saveUIConfig();
-            }
-#endif
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
-
-    void menuHandler::rebootMenu()
-    {
-        static const char *optionsArray[] = {"Back", "Confirm"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Reboot Device?";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                IF_SCREEN(screen->showSimpleBanner("Rebooting...", 0));
-                nodeDB->saveToDisk();
-                rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
+            screen->setFrames(graphics::Screen::FOCUS_SYSTEM);
+            if (TFT_MESH_r == 0 && TFT_MESH_g == 0 && TFT_MESH_b == 0) {
+                uiconfig.screen_rgb_color = 0;
             } else {
-                menuQueue = power_menu;
-                screen->runNow();
+                uiconfig.screen_rgb_color = (TFT_MESH_r << 16) | (TFT_MESH_g << 8) | TFT_MESH_b;
             }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
-
-    void menuHandler::shutdownMenu()
-    {
-        static const char *optionsArray[] = {"Back", "Confirm"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Shutdown Device?";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                InputEvent event = {
-                    .inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
-                inputBroker->injectInputEvent(&event);
-            } else {
-                menuQueue = power_menu;
-                screen->runNow();
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
-
-    void menuHandler::addFavoriteMenu()
-    {
-        screen->showNodePicker("Node To Favorite", 30000, [](uint32_t nodenum) -> void {
-            LOG_WARN("Nodenum: %u", nodenum);
-            nodeDB->set_favorite(true, nodenum);
-            screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-        });
-    }
-
-    void menuHandler::removeFavoriteMenu()
-    {
-
-        static const char *optionsArray[] = {"Back", "Yes"};
-        BannerOverlayOptions bannerOptions;
-        std::string message = "Unfavorite This Node?\n";
-        auto node = nodeDB->getMeshNode(graphics::UIRenderer::currentFavoriteNodeNum);
-        if (node && node->has_user) {
-            message += sanitizeString(node->user.long_name).substr(0, 15);
+            LOG_INFO("Storing Value of %d to uiconfig.screen_rgb_color", uiconfig.screen_rgb_color);
+            saveUIConfig();
         }
-        bannerOptions.message = message.c_str();
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                LOG_INFO("Removing %x as favorite node", graphics::UIRenderer::currentFavoriteNodeNum);
-                nodeDB->set_favorite(false, graphics::UIRenderer::currentFavoriteNodeNum);
-                screen->setFrames(graphics::Screen::FOCUS_DEFAULT);
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
+#endif
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::rebootMenu()
+{
+    static const char *optionsArray[] = {"Back", "Confirm"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Reboot Device?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            IF_SCREEN(screen->showSimpleBanner("Rebooting...", 0));
+            nodeDB->saveToDisk();
+            rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
+        } else {
+            menuQueue = power_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::shutdownMenu()
+{
+    static const char *optionsArray[] = {"Back", "Confirm"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Shutdown Device?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
+            inputBroker->injectInputEvent(&event);
+        } else {
+            menuQueue = power_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::addFavoriteMenu()
+{
+    screen->showNodePicker("Node To Favorite", 30000, [](uint32_t nodenum) -> void {
+        LOG_WARN("Nodenum: %u", nodenum);
+        nodeDB->set_favorite(true, nodenum);
+        screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
+    });
+}
+
+void menuHandler::removeFavoriteMenu()
+{
+
+    static const char *optionsArray[] = {"Back", "Yes"};
+    BannerOverlayOptions bannerOptions;
+    std::string message = "Unfavorite This Node?\n";
+    auto node = nodeDB->getMeshNode(graphics::UIRenderer::currentFavoriteNodeNum);
+    if (node && node->has_user) {
+        message += sanitizeString(node->user.long_name).substr(0, 15);
     }
+    bannerOptions.message = message.c_str();
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            LOG_INFO("Removing %x as favorite node", graphics::UIRenderer::currentFavoriteNodeNum);
+            nodeDB->set_favorite(false, graphics::UIRenderer::currentFavoriteNodeNum);
+            screen->setFrames(graphics::Screen::FOCUS_DEFAULT);
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::traceRouteMenu()
-    {
-        screen->showNodePicker("Node to Trace", 30000, [](uint32_t nodenum) -> void {
-            LOG_INFO("Menu: Node picker selected node 0x%08x, traceRouteModule=%p", nodenum, traceRouteModule);
-            if (traceRouteModule) {
-                traceRouteModule->startTraceRoute(nodenum);
-            }
-        });
-    }
+void menuHandler::traceRouteMenu()
+{
+    screen->showNodePicker("Node to Trace", 30000, [](uint32_t nodenum) -> void {
+        LOG_INFO("Menu: Node picker selected node 0x%08x, traceRouteModule=%p", nodenum, traceRouteModule);
+        if (traceRouteModule) {
+            traceRouteModule->startTraceRoute(nodenum);
+        }
+    });
+}
 
-    void menuHandler::testMenu()
-    {
+void menuHandler::testMenu()
+{
 
-        static const char *optionsArray[] = {"Back", "Number Picker"};
-        BannerOverlayOptions bannerOptions;
-        std::string message = "Test to Run?\n";
-        bannerOptions.message = message.c_str();
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == 1) {
-                menuQueue = number_test;
-                screen->runNow();
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+    static const char *optionsArray[] = {"Back", "Number Picker"};
+    BannerOverlayOptions bannerOptions;
+    std::string message = "Test to Run?\n";
+    bannerOptions.message = message.c_str();
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == 1) {
+            menuQueue = number_test;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::numberTest()
-    {
-        screen->showNumberPicker("Pick a number\n ", 30000, 4,
-                                 [](int number_picked) -> void { LOG_WARN("Nodenum: %u", number_picked); });
-    }
+void menuHandler::numberTest()
+{
+    screen->showNumberPicker("Pick a number\n ", 30000, 4,
+                             [](int number_picked) -> void { LOG_WARN("Nodenum: %u", number_picked); });
+}
 
-    void menuHandler::wifiBaseMenu()
-    {
-        enum optionsNumbers { Back, Wifi_toggle };
+void menuHandler::wifiBaseMenu()
+{
+    enum optionsNumbers { Back, Wifi_toggle };
 
-        static const char *optionsArray[] = {"Back", "WiFi Toggle"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "WiFi Menu";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == Wifi_toggle) {
-                menuQueue = wifi_toggle_menu;
-                screen->runNow();
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+    static const char *optionsArray[] = {"Back", "WiFi Toggle"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "WiFi Menu";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Wifi_toggle) {
+            menuQueue = wifi_toggle_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::wifiToggleMenu()
-    {
-        enum optionsNumbers { Back, Wifi_toggle };
+void menuHandler::wifiToggleMenu()
+{
+    enum optionsNumbers { Back, Wifi_toggle };
 
-        static const char *optionsArray[] = {"Back", "Disable"};
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Disable Wifi and\nEnable Bluetooth?";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = 2;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == Wifi_toggle) {
-                config.network.wifi_enabled = false;
-                config.bluetooth.enabled = true;
-                service->reloadConfig(SEGMENT_CONFIG);
-                rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+    static const char *optionsArray[] = {"Back", "Disable"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Disable Wifi and\nEnable Bluetooth?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Wifi_toggle) {
+            config.network.wifi_enabled = false;
+            config.bluetooth.enabled = true;
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::notificationsMenu()
-    {
-        enum optionsNumbers { Back, BuzzerActions };
-        static const char *optionsArray[] = {"Back", "Buzzer Actions"};
-        static int optionsEnumArray[] = {Back, BuzzerActions};
-        int options = 2;
+void menuHandler::notificationsMenu()
+{
+    enum optionsNumbers { Back, BuzzerActions };
+    static const char *optionsArray[] = {"Back", "Buzzer Actions"};
+    static int optionsEnumArray[] = {Back, BuzzerActions};
+    int options = 2;
 
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Notifications";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = options;
-        bannerOptions.optionsEnumPtr = optionsEnumArray;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == BuzzerActions) {
-                menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
-                screen->runNow();
-            } else {
-                menuQueue = system_base_menu;
-                screen->runNow();
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
-    }
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Notifications";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == BuzzerActions) {
+            menuHandler::menuQueue = menuHandler::buzzermodemenupicker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-    void menuHandler::screenOptionsMenu()
-    {
-        // Check if brightness is supported
-        bool hasSupportBrightness = false;
+void menuHandler::screenOptionsMenu()
+{
+    // Check if brightness is supported
+    bool hasSupportBrightness = false;
 #if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107)
-        hasSupportBrightness = true;
+    hasSupportBrightness = true;
 #endif
 
 #if defined(T_DECK)
-        // TDeck Doesn't seem to support brightness at all, at least not reliably
-        hasSupportBrightness = false;
+    // TDeck Doesn't seem to support brightness at all, at least not reliably
+    hasSupportBrightness = false;
 #endif
 
-        enum optionsNumbers { Back, Brightness, ScreenColor };
-        static const char *optionsArray[4] = {"Back"};
-        static int optionsEnumArray[4] = {Back};
-        int options = 1;
+    enum optionsNumbers { Back, Brightness, ScreenColor };
+    static const char *optionsArray[4] = {"Back"};
+    static int optionsEnumArray[4] = {Back};
+    int options = 1;
 
-        // Only show brightness for B&W displays
-        if (hasSupportBrightness) {
-            optionsArray[options] = "Brightness";
-            optionsEnumArray[options++] = Brightness;
-        }
-
-        // Only show screen color for TFT displays
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
-        optionsArray[options] = "Screen Color";
-        optionsEnumArray[options++] = ScreenColor;
-#endif
-
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Screen Options";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = options;
-        bannerOptions.optionsEnumPtr = optionsEnumArray;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == Brightness) {
-                menuHandler::menuQueue = menuHandler::brightness_picker;
-                screen->runNow();
-            } else if (selected == ScreenColor) {
-                menuHandler::menuQueue = menuHandler::tftcolormenupicker;
-                screen->runNow();
-            } else {
-                menuQueue = system_base_menu;
-                screen->runNow();
-            }
-        };
-        screen->showOverlayBanner(bannerOptions);
+    // Only show brightness for B&W displays
+    if (hasSupportBrightness) {
+        optionsArray[options] = "Brightness";
+        optionsEnumArray[options++] = Brightness;
     }
 
-    void menuHandler::powerMenu()
-    {
+    // Only show screen color for TFT displays
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
+    optionsArray[options] = "Screen Color";
+    optionsEnumArray[options++] = ScreenColor;
+#endif
 
-        enum optionsNumbers { Back, Reboot, Shutdown, MUI };
-        static const char *optionsArray[4] = {"Back"};
-        static int optionsEnumArray[4] = {Back};
-        int options = 1;
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Screen Options";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Brightness) {
+            menuHandler::menuQueue = menuHandler::brightness_picker;
+            screen->runNow();
+        } else if (selected == ScreenColor) {
+            menuHandler::menuQueue = menuHandler::tftcolormenupicker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
 
-        optionsArray[options] = "Reboot";
-        optionsEnumArray[options++] = Reboot;
+void menuHandler::powerMenu()
+{
 
-        optionsArray[options] = "Shutdown";
-        optionsEnumArray[options++] = Shutdown;
+    enum optionsNumbers { Back, Reboot, Shutdown, MUI };
+    static const char *optionsArray[4] = {"Back"};
+    static int optionsEnumArray[4] = {Back};
+    int options = 1;
+
+    optionsArray[options] = "Reboot";
+    optionsEnumArray[options++] = Reboot;
+
+    optionsArray[options] = "Shutdown";
+    optionsEnumArray[options++] = Shutdown;
 
 #if HAS_TFT
-        optionsArray[options] = "Switch to MUI";
-        optionsEnumArray[options++] = MUI;
+    optionsArray[options] = "Switch to MUI";
+    optionsEnumArray[options++] = MUI;
 #endif
 
-        BannerOverlayOptions bannerOptions;
-        bannerOptions.message = "Reboot / Shutdown";
-        bannerOptions.optionsArrayPtr = optionsArray;
-        bannerOptions.optionsCount = options;
-        bannerOptions.optionsEnumPtr = optionsEnumArray;
-        bannerOptions.bannerCallback = [](int selected) -> void {
-            if (selected == Reboot) {
-                menuHandler::menuQueue = menuHandler::reboot_menu;
-                screen->runNow();
-            } else if (selected == Shutdown) {
-                menuHandler::menuQueue = menuHandler::shutdown_menu;
-                screen->runNow();
-            } else if (selected == MUI) {
-                menuHandler::menuQueue = menuHandler::mui_picker;
-                screen->runNow();
-            } else {
-                menuQueue = system_base_menu;
-                screen->runNow();
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Reboot / Shutdown";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = options;
+    bannerOptions.optionsEnumPtr = optionsEnumArray;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Reboot) {
+            menuHandler::menuQueue = menuHandler::reboot_menu;
+            screen->runNow();
+        } else if (selected == Shutdown) {
+            menuHandler::menuQueue = menuHandler::shutdown_menu;
+            screen->runNow();
+        } else if (selected == MUI) {
+            menuHandler::menuQueue = menuHandler::mui_picker;
+            screen->runNow();
+        } else {
+            menuQueue = system_base_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::keyVerificationInitMenu()
+{
+    screen->showNodePicker("Node to Verify", 30000,
+                           [](uint32_t selected) -> void { keyVerificationModule->sendInitialRequest(selected); });
+}
+
+void menuHandler::keyVerificationFinalPrompt()
+{
+    char message[40] = {0};
+    memset(message, 0, sizeof(message));
+    sprintf(message, "Verification: \n");
+    keyVerificationModule->generateVerificationCode(message + 15); // send the toPhone packet
+
+    if (screen) {
+        static const char *optionsArray[] = {"Reject", "Accept"};
+        graphics::BannerOverlayOptions options;
+        options.message = message;
+        options.durationMs = 30000;
+        options.optionsArrayPtr = optionsArray;
+        options.optionsCount = 2;
+        options.notificationType = graphics::notificationTypeEnum::selection_picker;
+        options.bannerCallback = [=](int selected) {
+            if (selected == 1) {
+                auto remoteNodePtr = nodeDB->getMeshNode(keyVerificationModule->getCurrentRemoteNode());
+                remoteNodePtr->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
             }
         };
-        screen->showOverlayBanner(bannerOptions);
+        screen->showOverlayBanner(options);
     }
+}
 
-    void menuHandler::keyVerificationInitMenu()
-    {
-        screen->showNodePicker("Node to Verify", 30000,
-                               [](uint32_t selected) -> void { keyVerificationModule->sendInitialRequest(selected); });
-    }
-
-    void menuHandler::keyVerificationFinalPrompt()
-    {
-        char message[40] = {0};
-        memset(message, 0, sizeof(message));
-        sprintf(message, "Verification: \n");
-        keyVerificationModule->generateVerificationCode(message + 15); // send the toPhone packet
-
-        if (screen) {
-            static const char *optionsArray[] = {"Reject", "Accept"};
-            graphics::BannerOverlayOptions options;
-            options.message = message;
-            options.durationMs = 30000;
-            options.optionsArrayPtr = optionsArray;
-            options.optionsCount = 2;
-            options.notificationType = graphics::notificationTypeEnum::selection_picker;
-            options.bannerCallback = [=](int selected) {
-                if (selected == 1) {
-                    auto remoteNodePtr = nodeDB->getMeshNode(keyVerificationModule->getCurrentRemoteNode());
-                    remoteNodePtr->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
-                }
-            };
-            screen->showOverlayBanner(options);
-        }
-    }
-
-    void menuHandler::handleMenuSwitch(OLEDDisplay * display)
-    {
-        if (menuQueue != menu_none)
-            test_count = 0;
-        switch (menuQueue) {
-        case menu_none:
-            break;
-        case lora_picker:
-            LoraRegionPicker();
-            break;
-        case TZ_picker:
-            TZPicker();
-            break;
-        case twelve_hour_picker:
-            TwelveHourPicker();
-            break;
-        case clock_face_picker:
-            ClockFacePicker();
-            break;
-        case clock_menu:
-            clockMenu();
-            break;
-        case system_base_menu:
-            systemBaseMenu();
-            break;
-        case position_base_menu:
-            positionBaseMenu();
-            break;
+void menuHandler::handleMenuSwitch(OLEDDisplay *display)
+{
+    if (menuQueue != menu_none)
+        test_count = 0;
+    switch (menuQueue) {
+    case menu_none:
+        break;
+    case lora_picker:
+        LoraRegionPicker();
+        break;
+    case TZ_picker:
+        TZPicker();
+        break;
+    case twelve_hour_picker:
+        TwelveHourPicker();
+        break;
+    case clock_face_picker:
+        ClockFacePicker();
+        break;
+    case clock_menu:
+        clockMenu();
+        break;
+    case system_base_menu:
+        systemBaseMenu();
+        break;
+    case position_base_menu:
+        positionBaseMenu();
+        break;
 #if !MESHTASTIC_EXCLUDE_GPS
-        case gps_toggle_menu:
-            GPSToggleMenu();
-            break;
+    case gps_toggle_menu:
+        GPSToggleMenu();
+        break;
 #endif
-        case compass_point_north_menu:
-            compassNorthMenu();
-            break;
-        case reset_node_db_menu:
-            resetNodeDBMenu();
-            break;
-        case buzzermodemenupicker:
-            BuzzerModeMenu();
-            break;
-        case mui_picker:
-            switchToMUIMenu();
-            break;
-        case tftcolormenupicker:
-            TFTColorPickerMenu(display);
-            break;
-        case brightness_picker:
-            BrightnessPickerMenu();
-            break;
-        case reboot_menu:
-            rebootMenu();
-            break;
-        case shutdown_menu:
-            shutdownMenu();
-            break;
-        case add_favorite:
-            addFavoriteMenu();
-            break;
-        case remove_favorite:
-            removeFavoriteMenu();
-            break;
-        case trace_route_menu:
-            traceRouteMenu();
-            break;
-        case test_menu:
-            testMenu();
-            break;
-        case number_test:
-            numberTest();
-            break;
-        case wifi_toggle_menu:
-            wifiToggleMenu();
-            break;
-        case key_verification_init:
-            keyVerificationInitMenu();
-            break;
-        case key_verification_final_prompt:
-            keyVerificationFinalPrompt();
-            break;
-        case bluetooth_toggle_menu:
-            BluetoothToggleMenu();
-            break;
-        case notifications_menu:
-            notificationsMenu();
-            break;
-        case screen_options_menu:
-            screenOptionsMenu();
-            break;
-        case power_menu:
-            powerMenu();
-            break;
-        case throttle_message:
-            screen->showSimpleBanner("Too Many Attempts\nTry again in 60 seconds.", 5000);
-            break;
-        }
-        menuQueue = menu_none;
+    case compass_point_north_menu:
+        compassNorthMenu();
+        break;
+    case reset_node_db_menu:
+        resetNodeDBMenu();
+        break;
+    case buzzermodemenupicker:
+        BuzzerModeMenu();
+        break;
+    case mui_picker:
+        switchToMUIMenu();
+        break;
+    case tftcolormenupicker:
+        TFTColorPickerMenu(display);
+        break;
+    case brightness_picker:
+        BrightnessPickerMenu();
+        break;
+    case reboot_menu:
+        rebootMenu();
+        break;
+    case shutdown_menu:
+        shutdownMenu();
+        break;
+    case add_favorite:
+        addFavoriteMenu();
+        break;
+    case remove_favorite:
+        removeFavoriteMenu();
+        break;
+    case trace_route_menu:
+        traceRouteMenu();
+        break;
+    case test_menu:
+        testMenu();
+        break;
+    case number_test:
+        numberTest();
+        break;
+    case wifi_toggle_menu:
+        wifiToggleMenu();
+        break;
+    case key_verification_init:
+        keyVerificationInitMenu();
+        break;
+    case key_verification_final_prompt:
+        keyVerificationFinalPrompt();
+        break;
+    case bluetooth_toggle_menu:
+        BluetoothToggleMenu();
+        break;
+    case notifications_menu:
+        notificationsMenu();
+        break;
+    case screen_options_menu:
+        screenOptionsMenu();
+        break;
+    case power_menu:
+        powerMenu();
+        break;
+    case throttle_message:
+        screen->showSimpleBanner("Too Many Attempts\nTry again in 60 seconds.", 5000);
+        break;
     }
+    menuQueue = menu_none;
+}
 
-    void menuHandler::saveUIConfig()
-    {
-        nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
-    }
+void menuHandler::saveUIConfig()
+{
+    nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+}
 
 } // namespace graphics