diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index 329e59870..96fbb295a 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -1046,10 +1046,10 @@ void menuGeneralTrainer(uint8_t event)
   uint8_t y;
   bool slave = SLAVE_MODE();
 
-  MENU(STR_MENUTRAINER, menuTabDiag, e_Trainer, slave ? 1 : 7, {0, 2, 2, 2, 2, 0/*, 0*/});
+  MENU(STR_MENUTRAINER, menuTabDiag, e_Trainer, (slave ? 1 : 7), {0, 2, 2, 2, 2, 0/*, 0*/});
 
-  if (slave) { // i am the slave
-    lcd_puts(7*FW, 3*FH, STR_SLAVE);
+  if (slave) {
+    lcd_puts(7*FW, 4*FH, STR_SLAVE);
   }
   else {
     uint8_t attr;
diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index 2a803d826..f29924a6b 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -594,22 +594,24 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
     s_pgOfs=0;
   }
   else if (menuTab && horTab) {
-    while (1) {
-      vertpos_t line = s_pgOfs+1;
-      for (int numLines=0; line<=maxrow && numLines<LCD_LINES-1; line++) {
-        if (MAXCOL(line) != HIDDEN_ROW) {
-          numLines++;
+    if (maxrow > LCD_LINES-1) {
+      while (1) {
+        vertpos_t line = s_pgOfs+1;
+        for (int numLines=0; line<=maxrow && numLines<LCD_LINES-1; line++) {
+          if (MAXCOL(line) != HIDDEN_ROW) {
+            numLines++;
+          }
+        }
+        int max = line - s_pgOfs - 1;
+        if (l_posVert > max+s_pgOfs) {
+          s_pgOfs++;
+        }
+        else if (l_posVert < 1+s_pgOfs) {
+          s_pgOfs--;
+        }
+        else {
+          break;
         }
-      }
-      int max = line - s_pgOfs - 1;
-      if (l_posVert > max+s_pgOfs) {
-        s_pgOfs++;
-      }
-      else if (l_posVert < 1+s_pgOfs) {
-        s_pgOfs--;
-      }
-      else {
-        break;
       }
     }
   }
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 9e87008d7..0db3bb705 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -552,7 +552,7 @@
 #define TR_POTWARNING          TR("Pot Warn.", INDENT "Pot Positions")
 #define TR_TIMEZONE            TR("Time Zone","GPS Time zone")
 #define TR_RXCHANNELORD        TR("Rx Channel Ord","Default channel order")
-#define TR_SLAVE               "Slave"
+#define TR_SLAVE               CENTER "Slave"
 #define TR_MODESRC             "Mode\006% Source"
 #define TR_MULTIPLIER          "Multiplier"
 #define TR_CAL                 "Cal"