diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index ebd2b428..f43c01c1 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -296,8 +296,9 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="valign">center</property>
+            <property name="valign">start</property>
             <property name="margin_left">5</property>
+            <property name="margin_top">10</property>
             <property name="layout_style">start</property>
             <child>
               <object class="GtkButton" id="o_prev">
@@ -441,23 +442,26 @@
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
             <property name="width">2</property>
-            <property name="height">2</property>
+            <property name="height">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow2">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="margin_top">5</property>
             <property name="vscrollbar_policy">never</property>
             <child>
               <object class="GtkViewport" id="viewport2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
+                    <property name="row_spacing">5</property>
                     <property name="column_spacing">5</property>
                     <property name="row_homogeneous">True</property>
                     <child>
@@ -536,6 +540,7 @@
             <property name="left_attach">2</property>
             <property name="top_attach">0</property>
             <property name="width">4</property>
+            <property name="height">2</property>
           </packing>
         </child>
         <child>
@@ -592,7 +597,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">2</property>
             <property name="width">3</property>
           </packing>
         </child>
@@ -601,7 +606,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">end</property>
-            <property name="valign">center</property>
+            <property name="valign">start</property>
             <property name="spacing">5</property>
             <child>
               <object class="GtkLabel">
@@ -622,7 +627,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
-                <property name="margin_right">8</property>
+                <property name="margin_right">9</property>
                 <property name="active">0</property>
                 <items>
                   <item translatable="yes">(disabled)</item>
@@ -740,6 +745,7 @@
             <property name="left_attach">5</property>
             <property name="top_attach">1</property>
             <property name="width">2</property>
+            <property name="height">2</property>
           </packing>
         </child>
         <child>
@@ -750,7 +756,6 @@
             <property name="valign">start</property>
             <property name="margin_right">5</property>
             <property name="margin_top">10</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkToggleButton" id="o_random">
                 <property name="visible">True</property>
@@ -1076,6 +1081,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="valign">center</property>
+                                <property name="margin_right">10</property>
                                 <property name="active">True</property>
                                 <signal name="notify::active" handler="__queue_disabled" swapped="no"/>
                               </object>
@@ -1246,7 +1252,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">3</property>
             <property name="width">7</property>
           </packing>
         </child>
@@ -1254,6 +1260,13 @@
     </child>
     <accelerator key="Escape" signal="grab-focus"/>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="o_pause_after"/>
+      <widget name="buttonbox4"/>
+      <widget name="o_enable"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
       <widget name="buttonbox1"/>