diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index c38719226e..5e915c6513 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -237,29 +237,31 @@
                   paned.resize="true"
                   paned.shrink="true">
             <Table id="edit_packer"
-                   rows="4"
-                   columns="4">
+                   rows="3"
+                   columns="3">
               <EventBox id="master_bus_ui_home"
                         table.leftattach="0"
                         table.rightattach="1"
                         table.topattach="0"
                         table.bottomattach="2"
+                        table.xfill="false"
+                        table.yfill="false"
                         bgnormal="#ff00ff"/>
-              <EventBox id="time_bars_event_box"
-                        table.leftattach="1"
-                        table.rightattach="2"
-                        table.topattach="1"
-                        table.bottomattach="2"
-                        table.xfill="true"
-                        table.yshrink="true" ui.orphan="true"/>
+             <EventBox id="time_bars_event_box"
+                       table.leftattach="1"
+                       table.rightattach="2"
+                       table.topattach="0"
+                       table.bottomattach="1"
+                       table.xfill="true"
+                       table.yfill="false" ui.orphan="true"/>
               <VBox id="time_bars_vbox" ui.orphan="true"/>
               <Layout id="controls_layout"
                       hadjustment="unused_adjustment"
                       vadjustment="vertical_adjustment"
-                      table.leftattach="0"
+                      table.leftattach="1"
                       table.rightattach="2"
-                      table.topattach="2"
-                      table.bottomattach="3"
+                      table.topattach="1"
+                      table.bottomattach="2"
                       table.xfill="true"
                       table.yfill="true"
                       table.yexpand="true"