diff --git a/android/gradle.properties b/android/gradle.properties
index 65eed6426393974efb5a056ec44936d42b5ef2a1..4bb5439f682100f8ef4ba80a557fe4f2f0ab14c2 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.0.8
-app.versionCode=8
+app.versionName=0.0.9
+app.versionCode=9
diff --git a/lib/layout/board.dart b/lib/layout/board.dart
index bb722657c32dcf653eabf312e3c15b8f6538033b..bd42321f768a63f9a4d90c764e8d949980c1ee60 100644
--- a/lib/layout/board.dart
+++ b/lib/layout/board.dart
@@ -82,8 +82,16 @@ class Board {
       );
     }
 
+    double horizontalMargins = 20;
+    if (wordLength < 6) {
+      horizontalMargins = 40;
+      if (wordLength < 5) {
+        horizontalMargins = 60;
+      }
+    }
+
     return Container(
-      margin: EdgeInsets.symmetric(horizontal: 40),
+      margin: EdgeInsets.symmetric(horizontal: horizontalMargins),
       padding: EdgeInsets.all(2),
 
       child: Table(
diff --git a/lib/layout/game.dart b/lib/layout/game.dart
index 8f7de8271948865ff67811b1a0168cc7c4351b2c..6abe0c3753b64c4bbe634fa61982ed0fd29b2eb5 100644
--- a/lib/layout/game.dart
+++ b/lib/layout/game.dart
@@ -17,11 +17,17 @@ class Game {
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          Board.buildGameBoard(myProvider),
+          Expanded(
+            child: Board.buildGameBoard(myProvider),
+          ),
           SizedBox(height: 2),
-          gameIsFinished
-            ? Game.buildEndGameMessage(myProvider)
-            : Keyboard.buildWidget(myProvider),
+          Container(
+            height: 150,
+            width: double.maxFinite,
+            child: gameIsFinished
+              ? Game.buildEndGameMessage(myProvider)
+              : Keyboard.buildWidget(myProvider),
+          ),
         ],
       ),
     );