diff --git a/guacamole/src/main/webapp/app/osk/styles/osk.css b/guacamole/src/main/webapp/app/osk/styles/osk.css
index e4cba3879..3c5047960 100644
--- a/guacamole/src/main/webapp/app/osk/styles/osk.css
+++ b/guacamole/src/main/webapp/app/osk/styles/osk.css
@@ -101,13 +101,50 @@
     line-height: 0;
 }
 
-.guac-keyboard .guac-keyboard-group.guac-keyboard-main,
+.guac-keyboard .guac-keyboard-group.guac-keyboard-alpha,
 .guac-keyboard .guac-keyboard-group.guac-keyboard-movement {
     display: inline-block;
     text-align: center;
     vertical-align: top;
 }
 
+.guac-keyboard .guac-keyboard-group.guac-keyboard-main {
+
+    /* IE10 */
+    display: -ms-flexbox;
+    -ms-flex-align: stretch;
+    -ms-flex-direction: row;
+
+    /* Ancient Mozilla */
+    display: -moz-box;
+    -moz-box-align: stretch;
+    -moz-box-orient: horizontal;
+    
+    /* Ancient WebKit */
+    display: -webkit-box;
+    -webkit-box-align: stretch;
+    -webkit-box-orient: horizontal;
+
+    /* Old WebKit */
+    display: -webkit-flex;
+    -webkit-align-items: stretch;
+    -webkit-flex-direction: row;
+
+    /* W3C */
+    display: flex;
+    align-items: stretch;
+    flex-direction: row;
+
+}
+
+.guac-keyboard .guac-keyboard-group.guac-keyboard-movement {
+    -ms-flex: 1 1 auto;
+    -moz-box-flex: 1;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1 1 auto;
+    flex: 1 1 auto;
+}
+
 .guac-keyboard .guac-keyboard-gap {
     display: inline-block;
 }
diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty.json b/guacamole/src/main/webapp/layouts/en-us-qwerty.json
index 168a875ce..fc7cdfcea 100644
--- a/guacamole/src/main/webapp/layouts/en-us-qwerty.json
+++ b/guacamole/src/main/webapp/layouts/en-us-qwerty.json
@@ -347,23 +347,25 @@
         [ 0.1 ],
 
         {
-            "main" : [
+            "main" : {
+                "alpha" : [
 
-                [ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "Back" ],
-                [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ],
-                [ "Caps",  "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ],
-                [ "LShift", "z", "x", "c", "v",  "b", "n",  "m", ",", ".", "/",  "RShift" ],
-                [ "LCtrl", "Super", "LAlt",       "Space",        "RAlt", "Menu", "RCtrl" ]
+                    [ "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "Back" ],
+                    [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ],
+                    [ "Caps",  "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ],
+                    [ "LShift", "z", "x", "c", "v",  "b", "n",  "m", ",", ".", "/",  "RShift" ],
+                    [ "LCtrl", "Super", "LAlt",       "Space",        "RAlt", "Menu", "RCtrl" ]
 
-            ],
+                ],
 
-            "movement" : [
-                [ "Ins",  "Home", "PgUp"  ],
-                [ "Del",  "End",  "PgDn"  ],
-                [          0.5            ],
-                [          "Up"           ],
-                [ "Left", "Down", "Right" ]
-            ]
+                "movement" : [
+                    [ "Ins",  "Home", "PgUp"  ],
+                    [ "Del",  "End",  "PgDn"  ],
+                    [           1             ],
+                    [          "Up"           ],
+                    [ "Left", "Down", "Right" ]
+                ]
+            }
         }
 
     ],
@@ -386,12 +388,12 @@
         "Menu"  : 1.6,
         "RCtrl" : 1.6,
 
-        "Ins"  : 1.75,
-        "Home" : 1.75,
-        "PgUp" : 1.75,
-        "Del"  : 1.75,
-        "End"  : 1.75,
-        "PgDn" : 1.75
+        "Ins"  : 1.6,
+        "Home" : 1.6,
+        "PgUp" : 1.6,
+        "Del"  : 1.6,
+        "End"  : 1.6,
+        "PgDn" : 1.6
 
     }