diff --git a/radio/src/gui/colorlcd/LvglWrapper.cpp b/radio/src/gui/colorlcd/LvglWrapper.cpp
index 9becf7a37..518fab9b9 100644
--- a/radio/src/gui/colorlcd/LvglWrapper.cpp
+++ b/radio/src/gui/colorlcd/LvglWrapper.cpp
@@ -209,9 +209,6 @@ static lv_style_t numberedit_style_cursor_edit;
 
 static lv_style_t focus_key_style;
 
-
-extern lv_obj_class_t lv_numberedit_class;
-
 static void theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
 {
   LV_UNUSED(th);
diff --git a/radio/src/gui/colorlcd/model_heli.cpp b/radio/src/gui/colorlcd/model_heli.cpp
index 67c54af5f..b77afc0b2 100644
--- a/radio/src/gui/colorlcd/model_heli.cpp
+++ b/radio/src/gui/colorlcd/model_heli.cpp
@@ -25,7 +25,7 @@
 
 #define SET_DIRTY()     storageDirty(EE_MODEL)
 
-static const lv_coord_t line_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2),
+static const lv_coord_t line_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1),
                                           LV_GRID_TEMPLATE_LAST};
 static const lv_coord_t line_row_dsc[] = {LV_GRID_CONTENT,
                                           LV_GRID_TEMPLATE_LAST};
diff --git a/radio/src/gui/colorlcd/widget_settings.cpp b/radio/src/gui/colorlcd/widget_settings.cpp
index bbbe8b404..dbe956cb8 100644
--- a/radio/src/gui/colorlcd/widget_settings.cpp
+++ b/radio/src/gui/colorlcd/widget_settings.cpp
@@ -34,7 +34,7 @@ static const rect_t widgetSettingsDialogRect = {
   LCD_H - 2 * LCD_H / 5   // height
 };
 
-static const lv_coord_t line_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2),
+static const lv_coord_t line_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1),
                                           LV_GRID_TEMPLATE_LAST};
 static const lv_coord_t line_row_dsc[] = {LV_GRID_CONTENT,
                                           LV_GRID_TEMPLATE_LAST};
diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h
index c9e4ba7f2..b23ca4aaa 100644
--- a/radio/src/targets/nv14/libopenui_config.h
+++ b/radio/src/targets/nv14/libopenui_config.h
@@ -121,9 +121,7 @@ constexpr coord_t INPUT_EDIT_CURVE_LEFT = 0;
 constexpr coord_t INPUT_EDIT_CURVE_TOP = MENU_HEADER_HEIGHT;
 constexpr coord_t MENUS_LINE_HEIGHT = 40;
 constexpr coord_t MENUS_WIDTH = 200;
-constexpr coord_t MENUS_OFFSET_TOP = 20;
 constexpr coord_t POPUP_HEADER_HEIGHT = 30;
-constexpr coord_t MENUS_MIN_HEIGHT = 2 * MENUS_LINE_HEIGHT - 1;
 constexpr coord_t MENUS_MAX_HEIGHT = 7 * MENUS_LINE_HEIGHT - 1;
 
 constexpr rect_t MENUS_TOOLBAR_RECT =              { 35, (LCD_H - MENUS_MAX_HEIGHT) / 2, 50, MENUS_MAX_HEIGHT };
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index e7f8db16c..276583239 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -47,6 +47,7 @@ bool simu_running = false;
 
 uint32_t telemetryErrors = 0;
 
+typedef int32_t rotenc_t;
 volatile rotenc_t rotencValue = 0;
 
 // TODO: remove all STM32 defs
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 4d7e32a35..8006408c7 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 4d7e32a35b67537df9b7abf712d186f0553b930b
+Subproject commit 8006408c7adc53db114a9cdeada0b229ecbf1064