diff --git a/whipper/gui.py b/whipper/gui.py
index 9cb422b..fe1703d 100644
--- a/whipper/gui.py
+++ b/whipper/gui.py
@@ -214,11 +214,11 @@ class WhipperGui(Gtk.Application if Gtk is not None else object):
         primary = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
         primary.pack_start(self._build_controls(), False, False, 0)
         primary.pack_start(self._build_actions(), False, False, 0)
+        primary.pack_start(self._build_rip_options(), False, False, 0)
         shell.pack_start(primary, True, True, 0)
 
         secondary = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
         secondary.pack_start(self._build_disc_info_frame(), False, False, 0)
-        secondary.pack_start(self._build_rip_options(), False, False, 0)
         shell.pack_start(secondary, False, False, 0)
         return frame
 
@@ -289,7 +289,7 @@ class WhipperGui(Gtk.Application if Gtk is not None else object):
         self.max_retries_spin.connect("value-changed", self._on_settings_changed)
         grid.attach(self.max_retries_spin, 5, 2, 1, 1)
 
-        grid.attach(Gtk.Label(label="Working Dir", xalign=0), 0, 2, 1, 1)
+        grid.attach(Gtk.Label(label="Working Dir", xalign=0), 0, 3, 1, 1)
         self.working_directory_entry = Gtk.Entry()
         self.working_directory_entry.set_placeholder_text("Optional working directory")
         self.working_directory_entry.connect("changed", self._on_settings_changed)