diff --git a/src/menus.cpp b/src/menus.cpp
index 316b5a4b6..aa1e03ce4 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -335,7 +335,13 @@ bool check(uint8_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTa
         chainMenu((MenuFuncP)pgm_read_adr(&menuTab[cc]));
         return false;
       }
+
+#if defined(ROTARY_ENCODERS)
+      if (g_eeGeneral.reNavigation && s_editMode < 0)
+        attr = INVERS|BLINK;
+#endif
     }
+
     s_noScroll = 0;
     displayScreenIndex(curr, menuTabSize, attr);
 
diff --git a/src/menus.h b/src/menus.h
index 2177126dc..bbdf0b287 100644
--- a/src/menus.h
+++ b/src/menus.h
@@ -174,9 +174,9 @@ if (!check_simple(event,menu,tab,DIM(tab),(lines_count)-1)) return;
 SIMPLE_MENU_NOTITLE(tab, menu, lines_count); \
 TITLE(title)
 
-#define SUBMENU_NOTITLE(lines_count, ...) \
+#define SUBMENU_NOTITLE(lines_count, ...) { \
 static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \
-if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,(lines_count)-1)) return;
+if (!check(event,0,NULL,0,mstate_tab,DIM(mstate_tab)-1,(lines_count)-1)) return; }
 
 #define SUBMENU(title, lines_count, ...) \
 static const pm_uint8_t mstate_tab[] PROGMEM = __VA_ARGS__; \
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 5cd29cac7..3530c3019 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -418,7 +418,11 @@ void menuModelSelect(uint8_t event)
   lcd_outdezAtt(17*FW, 0, reusableBuffer.models.eepromfree, 0);
 #endif
 
+#if defined(ROTARY_ENCODERS)
+  displayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? ((g_eeGeneral.reNavigation && s_editMode < 0) ? INVERS|BLINK : INVERS) : 0);
+#else
   displayScreenIndex(e_ModelSelect, DIM(menuTabModel), (sub == g_eeGeneral.currModel) ? INVERS : 0);
+#endif
 
   if (sub-s_pgOfs < 1) s_pgOfs = max(0, sub-1);
   else if (sub-s_pgOfs > 5)  s_pgOfs = min(MAX_MODELS-7, sub-4);
@@ -1710,7 +1714,14 @@ void menuModelMixOne(uint8_t event)
   MixData *md2 = mixaddress(s_currIdx) ;
   putsChn(lcdLastPos+1*FW,0,md2->destCh+1,0);
 
+#if defined(ROTARY_ENCODERS)
+  if (m_posVert == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS)
+    SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 0, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/})
+  else
+    SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
+#else
   SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(ZCHAR|(sizeof(md2->name)-1)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
+#endif
 
   int8_t sub = m_posVert;
   int8_t editMode = s_editMode;
diff --git a/src/translations/cz.h b/src/translations/cz.h
index 4384d92ab..cc7638e01 100644
--- a/src/translations/cz.h
+++ b/src/translations/cz.h
@@ -422,8 +422,8 @@
 #define TR_CPU_MAH             "Spot\206eba"
 #define TR_COPROC              "CoProc."
 #define TR_COPROC_TEMP         "Tepl. MB \016>"
-#define TR_CAPAWARNING         "Alarm Kapacity"
-#define TR_TEMPWARNING         "Alarm Teploty"
+#define TR_CAPAWARNING         INDENT "Kapacity Low"
+#define TR_TEMPWARNING         INDENT "Teploty High"
 #define TR_FUNC                "Fce."
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"
diff --git a/src/translations/de.h b/src/translations/de.h
index a55f11c46..81ea00ebc 100644
--- a/src/translations/de.h
+++ b/src/translations/de.h
@@ -423,8 +423,8 @@
 #define TR_CPU_MAH             "Consumpt."
 #define TR_COPROC              "CoProc."
 #define TR_COPROC_TEMP         "MB temp. \007>"
-#define TR_CAPAWARNING         "Capacity Warning"
-#define TR_TEMPWARNING         "Temp Warning"
+#define TR_CAPAWARNING         INDENT "Capacity Low"
+#define TR_TEMPWARNING         INDENT "Temp High"
 #define TR_FUNC                "Func"
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"
diff --git a/src/translations/en.h b/src/translations/en.h
index 47236d8cc..f86ba35ee 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -428,8 +428,8 @@
 #define TR_CPU_MAH             "Consumpt."
 #define TR_COPROC              "CoProc."
 #define TR_COPROC_TEMP         "MB Temp. \016>"
-#define TR_CAPAWARNING         "Capacity Warning"
-#define TR_TEMPWARNING         "Temp Warning"
+#define TR_CAPAWARNING         INDENT "Capacity Low"
+#define TR_TEMPWARNING         INDENT "Temp High"
 #define TR_FUNC                "Func"
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"
diff --git a/src/translations/es.h b/src/translations/es.h
index 551f03d4a..916f5afb7 100644
--- a/src/translations/es.h
+++ b/src/translations/es.h
@@ -389,7 +389,7 @@
 #define TR_RXNUM               "RxNum"
 #define TR_SYNCMENU            "Sync [MENU]"
 #define TR_BACK                "Atras"
-#define TR_LIMIT               INDENT"Limit"
+#define TR_LIMIT               INDENT "Limit"
 #define TR_MINRSSI             "Min Rssi"
 #define TR_LATITUDE            "Latitud"
 #define TR_LONGITUDE           "Longitud"
@@ -422,8 +422,8 @@
 #define TR_CPU_MAH             "Consum."
 #define TR_COPROC              "CoProc."
 #define TR_COPROC_TEMP         "MB Temp. \016>"
-#define TR_CAPAWARNING         "Aviso Capacidad"
-#define TR_TEMPWARNING         "Aviso Temperat."
+#define TR_CAPAWARNING         INDENT "Capacidad Low"
+#define TR_TEMPWARNING         INDENT "Temperat High"
 #define TR_FUNC                "Funcion"
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 902dd7a8e..d0fb0e4e2 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -428,8 +428,8 @@
 #define TR_CPU_MAH             "Consomm."
 #define TR_COPROC              "CoProc."
 #define TR_COPROC_TEMP         "Temp. MB \016>"
-#define TR_CAPAWARNING         "Alerte capacit\200"
-#define TR_TEMPWARNING         "Alerte temp"
+#define TR_CAPAWARNING         INDENT "Capacit\200 Basse"
+#define TR_TEMPWARNING         INDENT "Temp Haute"
 #define TR_FUNC                "Fonc"
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"
diff --git a/src/translations/it.h b/src/translations/it.h
index cc402dce4..6d9cc6814 100644
--- a/src/translations/it.h
+++ b/src/translations/it.h
@@ -426,8 +426,8 @@
 #define TR_CPU_MAH             "Consumo"
 #define TR_COPROC              "CoProc."  
 #define TR_COPROC_TEMP         "Temp. MB \016>"
-#define TR_CAPAWARNING         "Avviso Capacita'"
-#define TR_TEMPWARNING         "Avviso Temp."
+#define TR_CAPAWARNING         INDENT "Capacita Low"
+#define TR_TEMPWARNING         INDENT "Temp High"
 #define TR_FUNC                "Funz"
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"
diff --git a/src/translations/se.h b/src/translations/se.h
index 323d56921..f43bd8fda 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -431,8 +431,8 @@
 #define TR_CPU_MAH             "F\202rbrukn."
 #define TR_COPROC              "CoProc."
 #define TR_COPROC_TEMP         "MB temp. \016>"
-#define TR_CAPAWARNING         "Kapacitetsvarning"
-#define TR_TEMPWARNING         "Tempvarning "
+#define TR_CAPAWARNING         INDENT "Kapacite Low"
+#define TR_TEMPWARNING         INDENT "Temp High"
 #define TR_FUNC                "Funk"
 #define TR_V1                  "V1"
 #define TR_V2                  "V2"