diff --git a/guacamole/src/main/webapp/app/osk/styles/osk.css b/guacamole/src/main/webapp/app/osk/styles/osk.css
index b93600d87..749201d9a 100644
--- a/guacamole/src/main/webapp/app/osk/styles/osk.css
+++ b/guacamole/src/main/webapp/app/osk/styles/osk.css
@@ -129,7 +129,14 @@
     
 }
 
-/* Center the arrow keys */
-.guac-keyboard .guac-keyboard-group.guac-keyboard-fine {
+
+/* Display both keyboard sections within same line */
+.guac-keyboard .guac-keyboard-group.guac-keyboard-main,
+.guac-keyboard .guac-keyboard-group.guac-keyboard-movement {
+    display: inline-block;
+}
+
+/* Center the keys within the cursor movement section */
+.guac-keyboard .guac-keyboard-group.guac-keyboard-movement {
     text-align: center;
 }
diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty.json b/guacamole/src/main/webapp/layouts/en-us-qwerty.json
index 94907372f..f156f8a58 100644
--- a/guacamole/src/main/webapp/layouts/en-us-qwerty.json
+++ b/guacamole/src/main/webapp/layouts/en-us-qwerty.json
@@ -360,7 +360,7 @@
                 [ "Del", "End",  "PgDn" ]
             ],
 
-            "fine" : [
+            "small" : [
                 [          "Up"           ],
                 [ "Left", "Down", "Right" ]
             ]