diff --git a/radio/src/gui/212x64/menu_radio.cpp b/radio/src/gui/212x64/menu_radio.cpp
index 819e4da8f..e0452d8ec 100644
--- a/radio/src/gui/212x64/menu_radio.cpp
+++ b/radio/src/gui/212x64/menu_radio.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -26,10 +26,7 @@ const MenuHandlerFunc menuTabGeneral[] = {
   menuRadioSpecialFunctions,
   menuRadioTrainer,
   menuRadioVersion,
-  menuRadioDiagKeys,
-  menuRadioDiagAnalogs,
-  menuRadioHardware,
-  menuRadioCalibration
+  menuRadioHardware
 };
 
 void menuRadioSpecialFunctions(event_t event)
diff --git a/radio/src/gui/212x64/menus.h b/radio/src/gui/212x64/menus.h
index 91fb3be07..4051a931f 100644
--- a/radio/src/gui/212x64/menus.h
+++ b/radio/src/gui/212x64/menus.h
@@ -66,10 +66,7 @@ enum MenuRadioIndexes {
   MENU_RADIO_SPECIAL_FUNCTIONS,
   MENU_RADIO_TRAINER,
   MENU_RADIO_VERSION,
-  MENU_RADIO_SWITCHES_TEST,
-  MENU_RADIO_ANALOGS_TEST,
   MENU_RADIO_HARDWARE,
-  MENU_RADIO_CALIBRATION,
   MENU_RADIO_PAGES_COUNT
 };
 
diff --git a/radio/src/gui/212x64/radio_calibration.cpp b/radio/src/gui/212x64/radio_calibration.cpp
index 339db6a02..e6b85c622 100644
--- a/radio/src/gui/212x64/radio_calibration.cpp
+++ b/radio/src/gui/212x64/radio_calibration.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -195,7 +195,7 @@ void menuCommonCalib(event_t event)
 
 void menuRadioCalibration(event_t event)
 {
-  check_simple(STR_MENUCALIBRATION, event, MENU_RADIO_CALIBRATION, menuTabGeneral, DIM(menuTabGeneral), 0);
+  check_submenu_simple(STR_MENUCALIBRATION, event, 0);
   menuCommonCalib(READ_ONLY() ? 0 : event);
   if (menuEvent) {
     menuCalibrationState = CALIB_START;
diff --git a/radio/src/gui/212x64/radio_diaganas.cpp b/radio/src/gui/212x64/radio_diaganas.cpp
index 46e426c19..39f656b81 100644
--- a/radio/src/gui/212x64/radio_diaganas.cpp
+++ b/radio/src/gui/212x64/radio_diaganas.cpp
@@ -22,7 +22,7 @@
 
 void menuRadioDiagAnalogs(event_t event)
 {
-  SIMPLE_MENU(STR_MENU_RADIO_ANALOGS, menuTabGeneral, MENU_RADIO_ANALOGS_TEST, 0);
+  SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, 0);
 
   for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
     coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
diff --git a/radio/src/gui/212x64/radio_diagkeys.cpp b/radio/src/gui/212x64/radio_diagkeys.cpp
index 7525e0d1c..88beb9b25 100644
--- a/radio/src/gui/212x64/radio_diagkeys.cpp
+++ b/radio/src/gui/212x64/radio_diagkeys.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -28,7 +28,7 @@ void displayKeyState(uint8_t x, uint8_t y, uint8_t key)
 
 void menuRadioDiagKeys(event_t event)
 {
-  SIMPLE_MENU(STR_MENU_RADIO_SWITCHES, menuTabGeneral, MENU_RADIO_SWITCHES_TEST, 1);
+  SIMPLE_SUBMENU(STR_MENU_RADIO_SWITCHES, 1);
 
   lcdDrawText(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM);
 
diff --git a/radio/src/gui/212x64/radio_hardware.cpp b/radio/src/gui/212x64/radio_hardware.cpp
index 7a9c9cda1..c67501d18 100644
--- a/radio/src/gui/212x64/radio_hardware.cpp
+++ b/radio/src/gui/212x64/radio_hardware.cpp
@@ -60,6 +60,7 @@ enum menuRadioHwItems {
 #endif
   ITEM_RADIO_HARDWARE_UART3_MODE,
   ITEM_RADIO_HARDWARE_JITTER_FILTER,
+  ITEM_RADIO_HARDWARE_DEBUG,
   ITEM_RADIO_HARDWARE_MAX
 };
 
@@ -90,7 +91,7 @@ enum menuRadioHwItems {
 
 void menuRadioHardware(event_t event)
 {
-  MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0 });
+  MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { 0, 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0, 1 });
 
   uint8_t sub = menuVerticalPosition;
 
@@ -105,6 +106,10 @@ void menuRadioHardware(event_t event)
     switch (k) {
       case ITEM_RADIO_HARDWARE_LABEL_STICKS:
         lcdDrawTextAlignedLeft(y, STR_STICKS);
+        lcdDrawText(HW_SETTINGS_COLUMN, y, STR_CALIB_BTN, attr);
+        if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
+          pushMenu(menuRadioCalibration);
+        }
         break;
       case ITEM_RADIO_HARDWARE_STICK1:
       case ITEM_RADIO_HARDWARE_STICK2:
@@ -233,6 +238,19 @@ void menuRadioHardware(event_t event)
         g_eeGeneral.jitterFilter = 1 - editCheckBox(b, HW_SETTINGS_COLUMN, y, STR_JITTER_FILTER, attr, event);
         break;
       }
+
+      case ITEM_RADIO_HARDWARE_DEBUG:
+        lcdDrawTextAlignedLeft(y, STR_DEBUG);
+        lcdDrawText(HW_SETTINGS_COLUMN
+          , y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0);
+        lcdDrawText(lcdLastRightPos + 2, y, STR_SWITCHES_BTN, menuHorizontalPosition == 1 ? attr : 0);
+        if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
+          if (menuHorizontalPosition == 0)
+            pushMenu(menuRadioDiagAnalogs);
+          else
+            pushMenu(menuRadioDiagKeys);
+        }
+        break;
     }
   }
 }
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 4ac05bd81..0ba362fe9 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -959,8 +959,8 @@
 #define TR_MODULE_RANGE        BUTTON(TR("Rng", "Range"))
 #define TR_RESET_BTN           BUTTON("Reset")
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 BUTTON("Volby")
 #define TR_TRAINER             "Trenér"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 959a58842..8cf560640 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -964,8 +964,8 @@
 #define TR_MODULE_RANGE        BUTTON(TR("Rng", "Range"))  //9XR-Pro
 #define TR_RESET_BTN           BUTTON("Reset")
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 BUTTON("Set")
 #define TR_TRAINER             "DSC Buchse PPM In/Out"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index fd1c75c68..1a92fbeb2 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -963,8 +963,8 @@
 #define TR_MODULE_RANGE                BUTTON(TR("Rng", "Range"))
 #define TR_RESET_BTN                   BUTTON("Reset")
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                         BUTTON("Set")
 #define TR_TRAINER                     "Trainer"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index af679dd62..6f78403bb 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -970,8 +970,8 @@
 #define TR_MODULE_RANGE        "[Limites]"
 #define TR_RESET_BTN           "[Reset]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Ajuste]"
 #define TR_TRAINER             "Aprendiz"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index ec3405e32..87a23b751 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -962,8 +962,8 @@
 #define TR_MODULE_RANGE        "[Range]"
 #define TR_RESET_BTN           "[Reset]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Set]"
 #define TR_TRAINER             "Trainer"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 3437cea2b..3eaca3a75 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -974,8 +974,8 @@
 #define TR_MODULE_RANGE                BUTTON(TR("Prt", "Port."))
 #define TR_RESET_BTN                   BUTTON("RAZ")
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                         BUTTON("Déf")
 #define TR_TRAINER                     "Ecolage"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 5f6fdfcfa..c324fd8d0 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -964,8 +964,8 @@
 #define TR_MODULE_RANGE        "[Range]"
 #define TR_RESET_BTN           "[Reset]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Set]"
 #define TR_TRAINER             TR("Trainer","Maestro/Allievo")
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index 23899ffeb..e16ea7eeb 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -965,8 +965,8 @@
 #define TR_MODULE_RANGE        TR("[Rng]", "[Range]")
 #define TR_RESET_BTN           "[Reset]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Set]"
 #define TR_TRAINER             "Trainer Poort"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 276042762..66912d5ff 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -965,8 +965,8 @@
 #define TR_MODULE_RANGE        TR("[Zas]","Zasięg")
 #define TR_RESET_BTN           "[Reset]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Set]"
 #define TR_TRAINER             "Port Trenera"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 915760275..d6ecbd14a 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -969,8 +969,8 @@
 #define TR_MODULE_RANGE        "[Range]"
 #define TR_RESET_BTN           "[Reset]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Set]"
 #define TR_TRAINER             "Trainer"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 9b6cef3bc..f4400ce4d 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -976,8 +976,8 @@
 #define TR_MODULE_RANGE        TR("[Tst]", "[Testa]")
 #define TR_RESET_BTN           "[Nollställ]"
 #define TR_DEBUG                       "Debug"
-#define TR_SWITCHES_BTN                BUTTON("SW")
-#define TR_ANALOGS_BTN                 BUTTON("Ana")
+#define TR_SWITCHES_BTN                BUTTON(TR("SW","Switches"))
+#define TR_ANALOGS_BTN                 BUTTON(TR("Ana","Analogs"))
 #define TR_CALIB_BTN                   BUTTON("Calibration")
 #define TR_SET                 "[Spara]"
 #define TR_TRAINER             "Trainer"