diff --git a/radio/src/gui/colorlcd/confirm_dialog.cpp b/radio/src/gui/colorlcd/confirm_dialog.cpp
index 1b2182c25..f45194187 100644
--- a/radio/src/gui/colorlcd/confirm_dialog.cpp
+++ b/radio/src/gui/colorlcd/confirm_dialog.cpp
@@ -24,30 +24,35 @@
 #include "static.h"
 #include "gridlayout.h"
 
-ConfirmDialog::ConfirmDialog(Window * parent, const char * title, const char * message, std::function<void(void)> confirmHandler) :
-  Dialog(parent, title, {LCD_W / 10 , LCD_H / 4, LCD_W - 2 * LCD_W / 10, LCD_H - 2 * LCD_H / 4}),
-  confirmHandler(std::move(confirmHandler))
+ConfirmDialog::ConfirmDialog(Window* parent, const char* title,
+                             const char* message,
+                             std::function<void(void)> confirmHandler) :
+    Dialog(parent, title, rect_t{}),
+    confirmHandler(std::move(confirmHandler))
 {
   auto form = &content->form;
-  FormGridLayout grid(content->form.width());
-  form->clear();
+  auto msg = new StaticText(form, rect_t{}, message);
+  msg->padAll(lv_dpx(16));
 
-  new StaticText(form, grid.getCenteredSlot(), message);
-  grid.setLabelWidth(15);
-  grid.setMarginRight(15);
-  grid.nextLine();
-  grid.nextLine();
+  auto box = new FormGroup(form, rect_t{});
+  box->setFlexLayout(LV_FLEX_FLOW_ROW);
 
-  auto noButton = new TextButton(form, grid.getFieldSlot(2, 0), STR_NO, [=]() -> int8_t {
-      this->deleteLater();
-      return 0;
+  auto box_obj = box->getLvObj();
+  lv_obj_set_style_flex_main_place(box_obj, LV_FLEX_ALIGN_SPACE_EVENLY, 0);
+  
+  auto btn = new TextButton(box, rect_t{}, STR_NO, [=]() -> int8_t {
+    this->deleteLater();
+    return 0;
   });
+  lv_obj_set_width(btn->getLvObj(), LV_DPI_DEF);
 
-  new TextButton(form, grid.getFieldSlot(2, 1), STR_YES, [=]() -> int8_t {
-      this->deleteLater();
-      this->confirmHandler();
-      return 0;
+  btn = new TextButton(box, rect_t{}, STR_YES, [=]() -> int8_t {
+    this->deleteLater();
+    this->confirmHandler();
+    return 0;
   });
+  lv_obj_set_width(btn->getLvObj(), LV_DPI_DEF);
 
-  // noButton->setFocus(SET_FOCUS_DEFAULT);
+  content->setWidth(LCD_W * 0.8);
+  content->updateSize();
 }
diff --git a/radio/src/gui/colorlcd/confirm_dialog.h b/radio/src/gui/colorlcd/confirm_dialog.h
index f05df7cac..3db62ec85 100644
--- a/radio/src/gui/colorlcd/confirm_dialog.h
+++ b/radio/src/gui/colorlcd/confirm_dialog.h
@@ -24,12 +24,14 @@
 
 #include "dialog.h"
 
-class ConfirmDialog: public Dialog {
-  public:
-    ConfirmDialog(Window * parent, const char * title, const char * message, std::function<void(void)> confirmHandler);
+class ConfirmDialog : public Dialog
+{
+ public:
+  ConfirmDialog(Window* parent, const char* title, const char* message,
+                std::function<void(void)> confirmHandler);
 
-  protected:
-    std::function<void(void)> confirmHandler;
+ protected:
+  std::function<void(void)> confirmHandler;
 };
 
 #endif // _CONFIRM_DIALOG_H_
diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp
index 9ceb296e5..1566ddabb 100644
--- a/radio/src/gui/colorlcd/model_select.cpp
+++ b/radio/src/gui/colorlcd/model_select.cpp
@@ -633,6 +633,7 @@ class ModelCategoryPage : public PageTab
 
   void build(FormWindow *window) override
   {
+    window->padAll(0);
     new ModelCategoryPageBody(window, category);
   }
 };
@@ -679,6 +680,7 @@ class CategoryEditPage : public PageTab
       grid.setMarginRight(15);
       grid.setLabelWidth(0);
       grid.spacer();
+      window->padAll(0);
 
       coord_t y = 2;