diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index 1029fdcce..77859b17a 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -515,13 +515,13 @@ class TrainerModuleWindow  : public FormGroup {
                               GET_DEFAULT(g_model.trainerData.delay * 50 + 300),
                               SET_VALUE(g_model.trainerData.delay, (newValue - 300) / 50));
         edit->setStep(50);
-        edit->setSuffix("us");
+        edit->setSuffix(STR_US);
 
         // PPM Polarity
         new Choice(this, grid.getFieldSlot(3, 2), STR_PPM_POL, 0, 1, GET_SET_DEFAULT(g_model.trainerData.pulsePol ));
         grid.nextLine();
       }
-      getParent()->moveWindowsTop(top(), adjustHeight());
+      getParent()->moveWindowsTop(top() + 1, adjustHeight());
     }
 
   protected:
@@ -757,7 +757,7 @@ class ModuleWindow : public FormGroup {
                               GET_DEFAULT(g_model.moduleData[moduleIdx].ppm.delay * 50 + 300),
                               SET_VALUE(g_model.moduleData[moduleIdx].ppm.delay, (newValue - 300) / 50));
         edit->setStep(50);
-        edit->setSuffix("us");
+        edit->setSuffix(STR_US);
 
         // PPM Polarity
         new Choice(this, grid.getFieldSlot(3, 2), STR_PPM_POL, 0, 1, GET_SET_DEFAULT(g_model.moduleData[moduleIdx].ppm.pulsePol ));
@@ -894,7 +894,7 @@ class ModuleWindow : public FormGroup {
         }
       }
 
-      getParent()->moveWindowsTop(top(), adjustHeight());
+      getParent()->moveWindowsTop(top() + 1, adjustHeight());
     }
 };
 
diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp
index 2137d36d1..df8e1904a 100644
--- a/radio/src/gui/colorlcd/radio_hardware.cpp
+++ b/radio/src/gui/colorlcd/radio_hardware.cpp
@@ -134,7 +134,7 @@ class BluetoothConfigWindow : public FormGroup
         grid.nextLine();
       }
 
-      getParent()->moveWindowsTop(top(), adjustHeight());
+      getParent()->moveWindowsTop(top() + 1, adjustHeight());
     }
 
   protected:
diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp
index 3ffab840f..cc511e32a 100644
--- a/radio/src/gui/colorlcd/radio_sdmanager.cpp
+++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp
@@ -89,7 +89,7 @@ class FilePreview : public Window
 class FlashModuleDialog: public FullScreenDialog
 {
   public:
-    FlashModuleDialog(ModuleIndex module):
+    explicit FlashModuleDialog(ModuleIndex module):
       FullScreenDialog(WARNING_TYPE_INFO, "Flash device"),
       device(module),
       progress(this, {100, 100, 100, 15})
diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio_setup.cpp
index ec6546e87..6894076e2 100644
--- a/radio/src/gui/colorlcd/radio_setup.cpp
+++ b/radio/src/gui/colorlcd/radio_setup.cpp
@@ -152,9 +152,6 @@ class DateTimeWindow : public FormGroup {
       seconds->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) {
         dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, value, flags | LEADING0, 2);
       });
-
-      grid.nextLine();
-      getParent()->moveWindowsTop(top(), adjustHeight());
     }
 };
 
diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp
index 70595992a..e720776a4 100644
--- a/radio/src/telemetry/multi.cpp
+++ b/radio/src/telemetry/multi.cpp
@@ -517,7 +517,7 @@ void MultiModuleSyncStatus::getRefreshString(char * statusText)
   tmp = strAppendUnsigned(tmp, inputLag, 5);
   tmp = strAppend(tmp, "us R ");
   tmp = strAppendUnsigned(tmp, (uint32_t) (adjustedRefreshRate / 1000), 5);
-  tmp = strAppend(tmp, "us");
+  tmp = strAppend(tmp, STR_US);
 #else
   tmp = strAppend(tmp, "Sync at ");
   tmp = strAppendUnsigned(tmp, (uint32_t) (adjustedRefreshRate / 1000000));
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 0b9820045..05cd2ae9d 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 0b9820045c5da742b10d6953b0155307aab81a1e
+Subproject commit 05cd2ae9dc309b7dc69369b3ed0953823e6c9194