diff --git a/data/gui/enter_gp_name_dialog.stkgui b/data/gui/enter_gp_name_dialog.stkgui
index 65b25b146..9ba553c30 100644
--- a/data/gui/enter_gp_name_dialog.stkgui
+++ b/data/gui/enter_gp_name_dialog.stkgui
@@ -12,7 +12,7 @@
 
         <spacer height="20" width="20" />
         
-        <button id="accept" I18N="In the 'add new grand prix' dialog" text="Create" align="center" proportion="1"/>
+        <button id="accept" I18N="In the 'add new grand prix' dialog" text="OK" align="center" proportion="1"/>
         <spacer height="15" width="20" />
         <button id="cancel" I18N="In the 'add new grand prix' dialog" text="Cancel" align="center" proportion="1"/>
         
diff --git a/data/gui/gp_info.stkgui b/data/gui/gp_info.stkgui
index 7568a38ee..8cb8867cc 100644
--- a/data/gui/gp_info.stkgui
+++ b/data/gui/gp_info.stkgui
@@ -8,7 +8,7 @@
 
         <spacer width="1" height="5%"/>
 
-        <box width="95%" height="40%" padding="10" layout="horizontal-row">
+        <box width="100%" height="40%" padding="10" layout="horizontal-row">
             <spacer width="10" height="100%"/>
             <!-- Left pane -->
             <div width="45%" height="100%" align="center" layout="vertical-row">
@@ -24,37 +24,32 @@
 
         </box>
         <spacer width="1" height="5%"/>
-        <box width="95%" height="25%" padding="10" layout="horizontal-row">
-            <spacer width="1" height="5%"/>
-            <div width="50%" height="100%" layout="vertical-row">
-
-                <div width="100%" height="20%" layout="horizontal-row" >
-                    <label id="ai-text" height="100%" width="50%" I18N="In the grand prix info screen" text="AI karts"/>
-                    <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
-                             wrap_around="true" />
-                </div>
-                <spacer height="5%" />
-                <div width="100%" height="20%" layout="horizontal-row" >
-                    <label id="reverse-text"      width="50%" height="100%" I18N="In the grand prix info screen" text="Reverse"/>
-                    <spinner id="reverse-spinner" width="50%" align="center" wrap_around="true" />
-                </div>
-                <spacer height="5%" />
-                <div width="100%" height="20%" layout="horizontal-row">
-                    <label id="track-text" width="50%" height="100%" text="Tracks"
-                           I18N="In the grand prix info screen"/>
-                    <spinner id="track-spinner" width="50%" min_value="1" max_value="20" align="center"
-                             wrap_around="true" />
-                    <spacer height="1%" />
-                </div>
-                <spacer height="5%" />
-                <div width="100%" height="20%" layout="horizontal-row" >
-                    <label   id="group-text"    width="50%" height="100%" I18N="In the grand prix info screen" text="Track group"/>
-                    <spinner id="group-spinner" width="50%" align="center" wrap_around="true" />
-                    <spacer proportion="1" height="2" />
-                </div>
+        <box width="100%" height="28%" padding="20" layout="vertical-row">
+            <div width="100%" height="20%" layout="horizontal-row" >
+                <label   id="ai-text"         width="50%" I18N="In the grand prix info screen" text="AI karts" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="ai-spinner"      width="30%" min_value="1" max_value="20" align="center" wrap_around="true" />
+            </div>
+            <spacer height="5%" />
+            <div width="100%" height="20%" layout="horizontal-row" >
+                <label   id="reverse-text"    width="50%" I18N="In the grand prix info screen" text="Reverse" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="reverse-spinner" width="30%" align="center" wrap_around="true" />
+            </div>
+            <spacer height="5%" />
+            <div width="100%" height="20%" layout="horizontal-row">
+                <label   id="track-text"      width="50%" I18N="In the grand prix info screen" text="Tracks" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="track-spinner"   width="30%" min_value="1" max_value="20" align="center" wrap_around="true" />
+            </div>
+            <spacer height="5%" />
+            <div width="100%" height="20%" layout="horizontal-row" >
+                <label   id="group-text"      width="50%" I18N="In the grand prix info screen" text="Track group" text_align="right"/>
+                <spacer width="30"/>
+                <spinner id="group-spinner"   width="30%" align="center" wrap_around="true" />
             </div>
         </box>
-        <spacer width="1" height="5%"/>
+        <spacer height="2%"/>
         <buttonbar id="buttons" height="15%" width="100%" align="center">
 
             <icon-button id="start" width="64" height="64" icon="gui/green_check.png"
diff --git a/data/gui/racesetup.stkgui b/data/gui/racesetup.stkgui
index 4865798fb..855ffb942 100644
--- a/data/gui/racesetup.stkgui
+++ b/data/gui/racesetup.stkgui
@@ -5,7 +5,7 @@
         <header height="5%" width="80%" text="Race Setup" align="center" text_align="center" />
 
         <spacer height="5%" width="25"/>
-        <box width="95%" height="40%" padding="10" layout="vertical-row">
+        <box width="100%" height="40%" padding="10" layout="vertical-row">
             <bright width="100%" text="Select a difficulty" align="center" text_align="left" />
 
             <ribbon id="difficulty" height="135" width="100%" align="center">
@@ -21,7 +21,7 @@
         </box>
         <spacer height="5%" width="25"/>
 
-        <box width="95%" height="40%" padding="10" layout="vertical-row">
+        <box width="100%" height="40%" padding="10" layout="vertical-row">
             <bright width="100%" text="Select a game mode" align="center" text_align="left" />
 
             <scrollable_toolbar id="gamemode" height="135" width="85%" label_location="bottom" align="center"
diff --git a/data/gui/track_info.stkgui b/data/gui/track_info.stkgui
index 4cc84dcf7..38e32fc0d 100644
--- a/data/gui/track_info.stkgui
+++ b/data/gui/track_info.stkgui
@@ -7,7 +7,7 @@
 
         <spacer width="1" height="5%"/>
 
-        <box width="95%" height="40%" padding="10" layout="horizontal-row">
+        <box width="100%" height="40%" padding="10" layout="horizontal-row">
             <!-- Left pane -->
             <div proportion="1" height="100%" layout="vertical-row">
                 <icon-button proportion="1" width="100%" height="100%" id="screenshot" custom_ratio="1.33333"/>
@@ -47,31 +47,33 @@
 
         </box>
         <spacer width="1" height="5%"/>
-        <box width="95%" height="25%" padding="10" layout="vertical-row">
-            <spacer width="1" height="5%"/>
-
-            <div width="75%" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="2" />
-                <label id="lap-text" height="100%" width="40%" I18N="In the track info screen" text="Number of laps"/>
-                <spacer witdh="40" height="2" />
-                <spinner id="lap-spinner" width="20%" min_value="1" max_value="20" align="center"
-                         wrap_around="true" />
-                <spacer proportion="1" height="2" />
+        <box width="100%" height="25%" padding="15" layout="vertical-row">
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label id="lap-text" proportion="1" I18N="In the track info screen" text="Number of laps" text_align="right"/>
+                <spacer width="40"/>
+                <div proportion="1" height="fit" layout="horizontal-row">
+                    <spinner id="lap-spinner" width="50%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                </div>
             </div>
-            <div width="75%" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="2" />
-                <label id="ai-text" height="100%" width="40%" I18N="In the track info screen" text="Number of AI karts"/>
-                <spacer with="40" height="2" />
-                <spinner id="ai-spinner" width="20%" min_value="1" max_value="20" align="center"
-                         wrap_around="true" />
-                <spacer proportion="1" height="2" />
+            <spacer height="10"/>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label id="ai-text" proportion="1" I18N="In the track info screen" text="Number of AI karts" text_align="right"/>
+                <spacer width="40"/>
+                <div proportion="1" height="fit" layout="horizontal-row">
+                    <spinner id="ai-spinner" width="50%" min_value="1" max_value="20" align="center"
+                             wrap_around="true" />
+                </div>
             </div>
-            <div width="75%" height="fit" layout="horizontal-row" >
-                <spacer width="40" height="2" />
-                <label id="reverse-text" height="100%" width="40%" I18N="In the track info screen" text="Drive in reverse"/>
-                <spacer width="40" height="2" />
-                <checkbox id="reverse"/>
-                <spacer proportion="1" height="2" />
+            <spacer height="10"/>
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label id="reverse-text" proportion="1" I18N="In the track info screen" text="Drive in reverse" text_align="right"/>
+                <spacer width="40"/>
+                <div proportion="1" height="fit" layout="horizontal-row">
+                    <div width="50%" height="fit" text-align="center" layout="vertical-row" >
+                        <checkbox id="reverse" align="center"/>
+                    </div>
+                </div>
             </div>
             <spacer width="1" height="2%"/>
         </box>