diff --git a/CHANGELOG b/CHANGELOG
index bc6a4d3d..9d471658 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+6.4.18:
+- UI spacing improvements
+
 6.4.18-rc:
 - Remove stack widget from UI
 - Add Library Path playlists
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index b02535a6..2bc4e8a1 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -282,8 +282,8 @@
                     <property name="icon_name">media-skip-backward</property>
                   </object>
                 </child>
-                <accelerator key="AudioPrev" signal="clicked"/>
                 <accelerator key="n" signal="clicked" modifiers="GDK_SHIFT_MASK"/>
+                <accelerator key="AudioPrev" signal="clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -317,8 +317,8 @@
                     <property name="icon_size">5</property>
                   </object>
                 </child>
-                <accelerator key="AudioPlay" signal="clicked"/>
                 <accelerator key="space" signal="clicked"/>
+                <accelerator key="AudioPlay" signal="clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -351,8 +351,8 @@
                     <property name="icon_size">5</property>
                   </object>
                 </child>
-                <accelerator key="AudioPlay" signal="clicked"/>
                 <accelerator key="space" signal="clicked"/>
+                <accelerator key="AudioPlay" signal="clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -385,8 +385,8 @@
                     <property name="icon_name">media-skip-forward</property>
                   </object>
                 </child>
-                <accelerator key="AudioNext" signal="clicked"/>
                 <accelerator key="n" signal="clicked"/>
+                <accelerator key="AudioNext" signal="clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -784,6 +784,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">2</property>
                 <property name="margin_right">3</property>
+                <property name="margin_bottom">4</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
@@ -850,8 +851,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="margin_right">1</property>
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
                     <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
@@ -991,6 +990,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">3</property>
                 <property name="margin_right">2</property>
+                <property name="row_spacing">3</property>
                 <child>
                   <object class="GtkBox" id="box10">
                     <property name="visible">True</property>
@@ -1040,6 +1040,7 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="margin_top">2</property>
                     <property name="vexpand">True</property>
                     <property name="shadow_type">in</property>
                     <child>
@@ -1235,7 +1236,6 @@
                     <property name="tooltip_text" translatable="yes">0%</property>
                     <property name="halign">start</property>
                     <property name="valign">center</property>
-                    <property name="margin_top">2</property>
                     <property name="hexpand">True</property>
                   </object>
                   <packing>
@@ -1248,7 +1248,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="margin_top">2</property>
                     <property name="hexpand">True</property>
                   </object>
                   <packing>
@@ -1261,7 +1260,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="margin_top">2</property>
                     <property name="hexpand">True</property>
                   </object>
                   <packing>