diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index 14669926a..e8bd44897 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -149,13 +149,14 @@ enum menuGeneralSetupItems {
   IF_VOICE(ITEM_SETUP_SPEAKER_VOLUME)
   IF_CPUARM(ITEM_SETUP_BEEP_VOLUME)
   IF_CPUARM(ITEM_SETUP_WAV_VOLUME)
+  IF_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME)
+  ITEM_SETUP_BEEP_LENGTH,
+  IF_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
+  IF_CPUARM(ITEM_SETUP_VARIO_LABEL)
   IF_CPUARM(ITEM_SETUP_VARIO_VOLUME)
   IF_CPUARM(ITEM_SETUP_VARIO_PITCH)
   IF_CPUARM(ITEM_SETUP_VARIO_RANGE)
   IF_CPUARM(ITEM_SETUP_VARIO_REPEAT)
-  IF_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME)
-  ITEM_SETUP_BEEP_LENGTH,
-  IF_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
   IF_HAPTIC(ITEM_SETUP_HAPTIC_LABEL)
   IF_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
   IF_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
@@ -214,7 +215,7 @@ void menuGeneralSetup(uint8_t event)
   }
 #endif
 
-  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, LABEL(TX_MODE), CASE_PCBTARANIS(0) 1/*to force edit mode*/});
+  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_CPUARM(LABEL(VARIO)) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, LABEL(TX_MODE), CASE_PCBTARANIS(0) 1/*to force edit mode*/});
 
   uint8_t sub = m_posVert - 1;
 
@@ -360,24 +361,6 @@ void menuGeneralSetup(uint8_t event)
       case ITEM_SETUP_WAV_VOLUME:
         SLIDER_5POS(y, g_eeGeneral.wavVolume, STR_WAV_VOLUME, event, attr);
         break;
-      case ITEM_SETUP_VARIO_VOLUME:
-        SLIDER_5POS(y, g_eeGeneral.varioVolume, STR_VARIO_VOLUME, event, attr);
-        break;
-      case ITEM_SETUP_VARIO_PITCH:
-        lcd_putsLeft(y, "\001Vario Pitch");
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
-        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
-        break;
-      case ITEM_SETUP_VARIO_RANGE:
-        lcd_putsLeft(y, "\001Vario Max");
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
-        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
-        break;
-      case ITEM_SETUP_VARIO_REPEAT:
-        lcd_putsLeft(y, "\001Vario Repeat");
-        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
-        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 120);
-        break;
       case ITEM_SETUP_BACKGROUND_VOLUME:
         SLIDER_5POS(y, g_eeGeneral.backgroundVolume, STR_BG_VOLUME, event, attr);
         break;
@@ -397,6 +380,33 @@ void menuGeneralSetup(uint8_t event)
         break;
 #endif
 
+#if defined(CPUARM)
+      case ITEM_SETUP_VARIO_LABEL:
+        lcd_putsLeft(y, STR_VARIO);
+        break;
+      case ITEM_SETUP_VARIO_VOLUME:
+        SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr);
+        break;
+      case ITEM_SETUP_VARIO_PITCH:
+        lcd_putsLeft(y, "\001Pitch at Zero");
+        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
+        lcd_putsAtt(lcdLastPos, y, "Hz", attr);
+        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
+        break;
+      case ITEM_SETUP_VARIO_RANGE:
+        lcd_putsLeft(y, "\001Pitch at Max");
+        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
+        lcd_putsAtt(lcdLastPos, y, "Hz", attr);
+        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
+        break;
+      case ITEM_SETUP_VARIO_REPEAT:
+        lcd_putsLeft(y, "\001Repeat at Zero");
+        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
+        lcd_putsAtt(lcdLastPos, y, "ms", attr);
+        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
+        break;
+#endif
+
 #if defined(HAPTIC)
       case ITEM_SETUP_HAPTIC_LABEL:
         lcd_putsLeft(y, STR_HAPTIC_LABEL);
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index 1d1fcd108..898f94080 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -614,7 +614,7 @@
 #define TR_ALARMSWARN          "ALARMS"
 #define TR_SWITCHWARN          TR("SWITCH","CONTROL")
 #define TR_INVERT_THR          TR("Invert Thr?","Invert Throttle?")
-#define TR_SPEAKER_VOLUME      INDENT "Volume"
+#define TR_SPEAKER_VOLUME      INDENT "Volume" // TODO could be TR_VOLUME ?
 #define TR_LCD                 "LCD"
 #define TR_BRIGHTNESS          INDENT "Brightness"
 #define TR_CPU_TEMP            "CPU Temp.\016>"
@@ -791,7 +791,7 @@
 
 #define TR_BEEP_VOLUME         "Beep Volume"
 #define TR_WAV_VOLUME          "Wav Volume"
-#define TR_VARIO_VOLUME        "Vario Volume"
+#define TR_VARIO_VOLUME        "Vario Volume" // TODO may be removed
 #define TR_BG_VOLUME           "Bg Volume"
 
 #define TR_TOP_BAR             "Top Bar"