diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index e6b7956ca..6ee06bbdd 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -62,7 +62,7 @@ LanguagePack * languagePacks[] = {
   &itLanguagePack,
   &plLanguagePack,
   &ptLanguagePack,
-  &skLanguagePack,
+  &skLanguagePack,
   &seLanguagePack,
   NULL
 };
@@ -1065,13 +1065,14 @@ void menuGeneralDiagKeys(uint8_t event)
   lcd_puts(14*FW, 3*FH, STR_VTRIM);
 
   for(uint8_t i=0; i<9; i++) {
-    uint8_t y = i*FH; //+FH;
 #if !defined(PCBTARANIS)
-    if(i>(SW_ID0-SW_BASE)) y-=FH; //overwrite ID0
+    uint8_t y = i*FH-FH;
+    if(i==(SW_ID0-SW_BASE)) continue; //ignore ID0
     putsSwitches(8*FW, y, i+1, 0); //ohne off,on
     displayKeyState(11*FW+2, y, (EnumKeys)(SW_BASE+i));
-#endif
-
+#else
+    uint8_t y = i*FH;
+#endif    
     if (i<8) {
       y = i/2*FH+FH*4;
       lcd_img(14*FW, y, sticks, i/2, 0);
@@ -1113,7 +1114,7 @@ void menuGeneralDiagAna(uint8_t event)
     uint8_t y = 1+FH+(i/2)*FH;
     uint8_t x = i&1 ? 64+5 : 0;
     putsStrIdx(x, y, PSTR("A"), i+1);
-    lcd_putc(x+2*FWNUM, y, ':');
+    lcd_putc(lcdNextPos, y, ':');
     lcd_outhex4(x+3*FW-1, y, anaIn(i));
     lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
   }
diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 34994aa0d..c70b668d9 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -923,11 +923,11 @@ void putsStrIdx(xcoord_t x, uint8_t y, const pm_char *str, uint8_t idx, LcdFlags
 {
   lcd_putsAtt(x, y, str, att);
 
-  if (att & SMLSIZE)
-    lcd_outdezNAtt(lcdLastPos+1, y, idx, att|LEFT, 2);
-  else
-    lcd_outdezNAtt(lcdLastPos, y, idx, att|LEFT, 2);
-
+//  if (att & SMLSIZE)
+//    lcd_outdezNAtt(lcdLastPos+1, y, idx, att|LEFT, 2);
+//  else
+  lcd_outdezNAtt(lcdNextPos, y, idx, att|LEFT, 2);
+/*
 #if defined(CPUARM)
   uint8_t lastPos = lcdLastPos;
 #endif
@@ -937,6 +937,7 @@ void putsStrIdx(xcoord_t x, uint8_t y, const pm_char *str, uint8_t idx, LcdFlags
 #if defined(CPUARM)
   lcdLastPos = lastPos;
 #endif
+*/
 }
 
 void putsMixerSource(xcoord_t x, uint8_t y, uint8_t idx, LcdFlags att)