diff --git a/data/gui/edit_track.stkgui b/data/gui/edit_track.stkgui
index 89d48f18c..115adfdb9 100644
--- a/data/gui/edit_track.stkgui
+++ b/data/gui/edit_track.stkgui
@@ -2,25 +2,26 @@
 <stkgui>
     <div x="2%" y="1%" width="96%" height="98%" layout="vertical-row" padding="10">
 
-        <header id="selected_track" width="80%" height="30"
+        <header id="selected_track" width="80%"
             I18N="No neeed to translate this, it will be overwritten by the track name"
             text="" align="center" text_align="center" />
 
         <spacer height="20" />
 
         <!-- Track selection -->
-        <box width="100%" height="60%" layout="vertical-row">
-            <ribbon_grid id="tracks" proportion="1" width="100%" height="100%" square_items="true"
-                label_location="each" align="center" child_width="240" child_height="160" />
+        <box proportion="3" width="100%" layout="vertical-row">
+            <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+                label_location="each" align="center" max_rows="2" child_width="160"
+                child_height="120"/>
         </box>
 
         <!-- Populated dynamically at runtime -->
         <tabs width="100%" height="5%" id="trackgroups"> </tabs>
 
-        <spacer height="50" />
+        <spacer height="10%" />
 
         <!-- Laps and reverse -->
-        <div width="100%" height="100" layout="horizontal-row" align="center">
+        <div width="100%" height="fit" layout="horizontal-row" align="center">
 
             <spacer proportion="1" />
 
@@ -40,8 +41,10 @@
             <spacer proportion="1" />
         </div>
 
+        <spacer height="5%" />
+
         <!-- Dialog buttons -->
-        <div width="100%" height="60" layout="horizontal-row">
+        <div width="100%" height="fit" layout="horizontal-row">
             <spacer proportion="2" />
             <button id="ok" text="OK" proportion="1" />
             <spacer proportion="1" />
@@ -49,5 +52,7 @@
             <spacer proportion="2" />
         </div>
 
+        <spacer height="2%" />
+
     </div>
 </stkgui>
diff --git a/data/gui/grand_prix_editor.stkgui b/data/gui/grand_prix_editor.stkgui
index c27c72dc6..71b72cc36 100644
--- a/data/gui/grand_prix_editor.stkgui
+++ b/data/gui/grand_prix_editor.stkgui
@@ -7,9 +7,9 @@
         <header width="80%" I18N="Title in grand prix editor screen" text="Grand Prix editor"
                 align="center" text_align="center" />
 
-        <spacer height="20" />
+        <spacer height="10" />
 
-        <box proportion="4" width="100%" layout="vertical-row">
+        <box proportion="8" width="100%" layout="vertical-row">
             <ribbon_grid id="gplist" proportion="1" width="100%" square_items="true"
                 label_location="each" align="left" max_rows="2" child_width="160"
                 child_height="120" keep_selection="true" />
@@ -20,7 +20,7 @@
 
         <spacer height="20" />
 
-        <box proportion="2" width="100%" layout="vertical-row">
+        <box proportion="5" width="100%" layout="vertical-row">
             <label id="gpname" text_align="center" width="100%" text="" />
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
                 label_location="each" align="left" max_rows="1"
@@ -29,7 +29,7 @@
 
         <spacer height="20" />
 
-        <buttonbar proportion="1" id="menu" height="135" width="100%" align="center">
+        <buttonbar proportion="3" id="menu" height="135" width="100%" align="center">
             <icon-button id="new" width="128" height="128" icon="gui/gp_new.png"
                 I18N="Menu item" text="New" />
             <icon-button id="copy" width="128" height="128" icon="gui/gp_copy.png"