diff --git a/src/ui/app.rs b/src/ui/app.rs
index 218edb3..a36333e 100644
--- a/src/ui/app.rs
+++ b/src/ui/app.rs
@@ -54,7 +54,9 @@ impl AsyncComponent for AppModel {
                             set_hexpand: true,
                     },
                 },
-                model.mcdu.widget(),
+                model.mcdu.widget() {
+                    set_margin_all: 10,
+                },
             }
         }
     }
diff --git a/src/ui/mcdu.rs b/src/ui/mcdu.rs
index d7193c2..df51b9a 100644
--- a/src/ui/mcdu.rs
+++ b/src/ui/mcdu.rs
@@ -50,6 +50,8 @@ impl SimpleComponent for McduModel {
             },
             #[name = "keyboard"]
             gtk::Grid {
+                set_column_homogeneous: true,
+                set_row_homogeneous: true,
                 set_column_spacing: 5,
                 set_row_spacing: 5,
             }