diff --git a/interfaces/main.ui b/interfaces/main.ui
index 00f41fa..27562b7 100644
--- a/interfaces/main.ui
+++ b/interfaces/main.ui
@@ -87,7 +87,7 @@
 		<property name="can-focus">True</property>
 		<property name="resizable">False</property>
 		<child>
-			<object class="GTkBox" id="box3">
+			<object class="GtkBox" id="box3">
 				<property name="visible">True</property>
 				<property name="can-focus">True</property>
 				<property name="orientation">vertical</property>
@@ -146,148 +146,110 @@
 						</child>
 					</object>
 				</child>
+				<child>
+					<object class="GtkComboBoxText" id="comboboxtext1">
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="margin-start">10</property>
+						<property name="margin-end">10</property>
+						<property name="margin-top">5</property>
+						<property name="margin-bottom">5</property>
+					</object>
+				</child>
+				<child>
+					<object class="GtkBox">
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="margin-start">5</property>
+						<property name="margin-end">5</property>
+						<property name="margin-bottom">5</property>
+						<property name="homogeneous">True</property>
 						<child>
-							<object class="GtkComboBoxText" id="comboboxtext1">
-								<property name="visible">True</property>
-								<property name="can-focus">True</property>
-								<property name="margin-start">10</property>
-								<property name="margin-end">10</property>
-								<property name="margin-top">5</property>
-								<property name="margin-bottom">5</property>
-							</object>
-						</child>
-						<child>
-							<object class="GtkBox">
+							<object class="GtkButton" id="window_grab_button">
+								<property name="label" translatable="yes">button</property>
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
+								<property name="receives-default">True</property>
 								<property name="margin-start">5</property>
 								<property name="margin-end">5</property>
+								<property name="margin-top">5</property>
 								<property name="margin-bottom">5</property>
-								<property name="homogeneous">True</property>
-								<child>
-									<object class="GtkButton" id="window_grab_button">
-										<property name="label" translatable="yes">button</property>
-										<property name="visible">True</property>
-										<property name="can-focus">True</property>
-										<property name="receives-default">True</property>
-										<property name="margin-start">5</property>
-										<property name="margin-end">5</property>
-										<property name="margin-top">5</property>
-										<property name="margin-bottom">5</property>
-									</object>
-								</child>
-								<child>
-									<object class="GtkButton" id="area_grab_button">
-										<property name="label" translatable="yes">button</property>
-										<property name="visible">True</property>
-										<property name="can-focus">True</property>
-										<property name="receives-default">True</property>
-										<property name="margin-start">5</property>
-										<property name="margin-end">5</property>
-										<property name="margin-top">5</property>
-										<property name="margin-bottom">5</property>
-									</object>
-							    </child>
 							</object>
 						</child>
 						<child>
-							<!-- n-columns=2 n-rows=1 -->
-							<object class="GtkGrid" id="grid1">
+							<object class="GtkButton" id="area_grab_button">
+								<property name="label" translatable="yes">button</property>
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
-								<property name="margin-start">10</property>
-								<property name="margin-end">10</property>
+								<property name="receives-default">True</property>
+								<property name="margin-start">5</property>
+								<property name="margin-end">5</property>
 								<property name="margin-top">5</property>
 								<property name="margin-bottom">5</property>
+							</object>
+						</child>
+					</object>
+				</child>
+				<child>
+					<!-- n-columns=2 n-rows=1 -->
+					<object class="GtkGrid" id="grid1">
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="margin-start">10</property>
+						<property name="margin-end">10</property>
+						<property name="margin-top">5</property>
+						<property name="margin-bottom">5</property>
+						<property name="row-homogeneous">True</property>
+						<property name="column-homogeneous">True</property>
+						<child>
+							<!-- n-columns=2 n-rows=2 -->
+							<object class="GtkGrid">
+								<property name="visible">True</property>
+								<property name="can-focus">True</property>
 								<property name="row-homogeneous">True</property>
 								<property name="column-homogeneous">True</property>
 								<child>
-									<!-- n-columns=2 n-rows=2 -->
-									<object class="GtkGrid">
+									<object class="GtkCheckButton" id="videoswitch">
+										<property name="label" translatable="yes">checkbutton</property>
 										<property name="visible">True</property>
 										<property name="can-focus">True</property>
-										<property name="row-homogeneous">True</property>
-										<property name="column-homogeneous">True</property>
-										<child>
-											<object class="GtkCheckButton" id="videoswitch">
-												<property name="label" translatable="yes">checkbutton</property>
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="receives-default">False</property>
-												<property name="active">True</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkCheckButton" id="audioswitch">
-												<property name="label" translatable="yes">checkbutton</property>
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="receives-default">False</property>
-												<property name="active">True</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkCheckButton" id="mouseswitch">
-												<property name="label" translatable="yes">checkbutton</property>
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="receives-default">False</property>
-												<property name="active">True</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkCheckButton" id="followmouseswitch">
-												<property name="label" translatable="yes">checkbutton</property>
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="receives-default">False</property>
-												<property name="active">True</property>
-											</object>
-										</child>
+										<property name="receives-default">False</property>
+										<property name="active">True</property>
 									</object>
 								</child>
 								<child>
-									<!-- n-columns=2 n-rows=2 -->
-									<object class="GtkGrid">
+									<object class="GtkCheckButton" id="audioswitch">
+										<property name="label" translatable="yes">checkbutton</property>
 										<property name="visible">True</property>
 										<property name="can-focus">True</property>
-										<property name="row-spacing">3</property>
-										<property name="row-homogeneous">True</property>
-										<property name="column-homogeneous">True</property>
-										<child>
-											<object class="GtkLabel" id="frames_label">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="label" translatable="yes">label</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkSpinButton" id="frames">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="max-width-chars">2</property>
-												<property name="text" translatable="yes">30</property>
-												<property name="adjustment">adjustment2</property>
-												<property name="value">30</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkLabel" id="delay_label">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="label" translatable="yes">label</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkSpinButton" id="delay">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="max-width-chars">2</property>
-												<property name="text" translatable="yes">0</property>
-												<property name="adjustment">adjustment1</property>
-												<property name="climb-rate">1</property>
-											</object>
-										</child>
+										<property name="receives-default">False</property>
+										<property name="active">True</property>
+									</object>
+								</child>
+								<child>
+									<object class="GtkCheckButton" id="mouseswitch">
+										<property name="label" translatable="yes">checkbutton</property>
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="receives-default">False</property>
+										<property name="active">True</property>
+										<layout>
+											<property name="column">0</property>
+											<property name="row">1</property>
+										</layout>
+									</object>
+								</child>
+								<child>
+									<object class="GtkCheckButton" id="followmouseswitch">
+										<property name="label" translatable="yes">checkbutton</property>
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="receives-default">False</property>
+										<property name="active">True</property>
+										<layout>
+											<property name="column">1</property>
+											<property name="row">1</property>
+										</layout>
 									</object>
 								</child>
 							</object>
@@ -297,135 +259,205 @@
 							<object class="GtkGrid">
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
-								<property name="margin-start">10</property>
-								<property name="margin-end">10</property>
-								<property name="margin-top">5</property>
-								<property name="margin-bottom">5</property>
-								<property name="row-spacing">2</property>
-								<property name="column-spacing">5</property>
+								<property name="row-spacing">3</property>
+								<property name="row-homogeneous">True</property>
+								<property name="column-homogeneous">True</property>
 								<child>
-									<object class="GtkEntry" id="command">
+									<object class="GtkLabel" id="frames_label">
 										<property name="visible">True</property>
 										<property name="can-focus">True</property>
-										<property name="margin-top">5</property>
-										<property name="margin-bottom">5</property>
-										<property name="hexpand">True</property>
-										<property name="vexpand">True</property>
-									</object>
-								</child>
-								<child>
-									<object class="GtkLabel" id="command_label">
-										<property name="visible">True</property>
-										<property name="can-focus">True</property>
-										<property name="margin-top">5</property>
-										<property name="margin-bottom">5</property>
 										<property name="label" translatable="yes">label</property>
 									</object>
 								</child>
 								<child>
-									<object class="GtkLabel" id="audio_source_label">
+									<object class="GtkSpinButton" id="frames">
 										<property name="visible">True</property>
 										<property name="can-focus">True</property>
-										<property name="margin-top">5</property>
-										<property name="margin-bottom">5</property>
-										<property name="label" translatable="yes">label</property>
+										<property name="max-width-chars">2</property>
+										<property name="text" translatable="yes">30</property>
+										<property name="adjustment">adjustment2</property>
+										<property name="value">30</property>
 									</object>
 								</child>
 								<child>
-									<object class="GtkComboBoxText" id="audiosource">
+									<object class="GtkLabel" id="delay_label">
 										<property name="visible">True</property>
 										<property name="can-focus">True</property>
-										<property name="margin-top">5</property>
-										<property name="margin-bottom">5</property>
-										<property name="hexpand">True</property>
-										<property name="vexpand">True</property>
+										<property name="label" translatable="yes">label</property>
+										<layout>
+											<property name="column">0</property>
+											<property name="row">1</property>
+										</layout>
+									</object>
+								</child>
+								<child>
+									<object class="GtkSpinButton" id="delay">
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="max-width-chars">2</property>
+										<property name="text" translatable="yes">0</property>
+										<property name="adjustment">adjustment1</property>
+										<property name="climb-rate">1</property>
+										<layout>
+											<property name="column">1</property>
+											<property name="row">1</property>
+										</layout>
 									</object>
 								</child>
 							</object>
 						</child>
 					</object>
 				</child>
-				<child type="titlebar">
-					<object class="GtkHeaderBar">
+				<child>
+					<!-- n-columns=2 n-rows=2 -->
+					<object class="GtkGrid">
 						<property name="visible">True</property>
 						<property name="can-focus">True</property>
+						<property name="margin-start">10</property>
+						<property name="margin-end">10</property>
+						<property name="margin-top">5</property>
+						<property name="margin-bottom">5</property>
+						<property name="row-spacing">2</property>
+						<property name="column-spacing">5</property>
 						<child>
-							<object class="GtkButton" id="recordbutton">
+							<object class="GtkEntry" id="command">
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
-								<property name="receives-default">True</property>
-								<child>
-									<!-- n-columns=2 n-rows=1 -->
-									<object class="GtkGrid">
-										<property name="visible">True</property>
-										<property name="can-focus">True</property>
-										<property name="column-spacing">2</property>
-										<property name="row-homogeneous">True</property>
-										<child>
-											<object class="GtkImage">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="icon-name">media-record</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkLabel">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="label" translatable="yes">Record</property>
-											</object>
-										</child>
-									</object>
-								</child>
+								<property name="margin-top">5</property>
+								<property name="margin-bottom">5</property>
+								<property name="hexpand">True</property>
+								<property name="vexpand">True</property>
+								<layout>
+									<property name="column">1</property>
+									<property name="row">1</property>
+								</layout>
 							</object>
 						</child>
 						<child>
-							<object class="GtkButton" id="stopbutton">
+							<object class="GtkLabel" id="command_label">
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
-								<property name="receives-default">True</property>
-								<child>
-									<!-- n-columns=2 n-rows=1 -->
-									<object class="GtkGrid">
-										<property name="visible">True</property>
-										<property name="can-focus">True</property>
-										<property name="column-spacing">2</property>
-										<property name="row-homogeneous">True</property>
-										<child>
-											<object class="GtkImage">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="icon-name">media-playback-stop</property>
-											</object>
-										</child>
-										<child>
-											<object class="GtkLabel">
-												<property name="visible">True</property>
-												<property name="can-focus">True</property>
-												<property name="label" translatable="yes">Stop Recording</property>
-											</object>
-										</child>
-									</object>
-								</child>
+								<property name="margin-top">5</property>
+								<property name="margin-bottom">5</property>
+								<property name="label" translatable="yes">label</property>
+								<layout>
+									<property name="column">0</property>
+									<property name="row">1</property>
+								</layout>
 							</object>
 						</child>
 						<child>
-							<object class="GtkButton" id="playbutton">
-								<property name="icon_name">media-playback-start</property>
+							<object class="GtkLabel" id="audio_source_label">
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
-								<property name="receives-default">True</property>
+								<property name="margin-top">5</property>
+								<property name="margin-bottom">5</property>
+								<property name="label" translatable="yes">label</property>
+								<layout>
+									<property name="column">0</property>
+									<property name="row">0</property>
+								</layout>
 							</object>
 						</child>
-						<child type="end">
-							<object class="GtkButton" id="about_menu_item">
-								<property name="label">About</property>
+						<child>
+							<object class="GtkComboBoxText" id="audiosource">
 								<property name="visible">True</property>
 								<property name="can-focus">True</property>
-								<property name="receives-default">True</property>
+								<property name="margin-top">5</property>
+								<property name="margin-bottom">5</property>
+								<property name="hexpand">True</property>
+								<property name="vexpand">True</property>
+								<layout>
+									<property name="column">1</property>
+									<property name="row">0</property>
+								</layout>
 							</object>
 						</child>
 					</object>
 				</child>
 			</object>
-		</interface>
+		</child>
+		<child type="titlebar">
+			<object class="GtkHeaderBar">
+				<property name="visible">True</property>
+				<property name="can-focus">True</property>
+				<child>
+					<object class="GtkButton" id="recordbutton">
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="receives-default">True</property>
+						<child>
+							<!-- n-columns=2 n-rows=1 -->
+							<object class="GtkGrid">
+								<property name="visible">True</property>
+								<property name="can-focus">True</property>
+								<property name="column-spacing">2</property>
+								<property name="row-homogeneous">True</property>
+								<child>
+									<object class="GtkImage">
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="icon-name">media-record</property>
+									</object>
+								</child>
+								<child>
+									<object class="GtkLabel">
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="label" translatable="yes">Record</property>
+									</object>
+								</child>
+							</object>
+						</child>
+					</object>
+				</child>
+				<child>
+					<object class="GtkButton" id="stopbutton">
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="receives-default">True</property>
+						<child>
+							<!-- n-columns=2 n-rows=1 -->
+							<object class="GtkGrid">
+								<property name="visible">True</property>
+								<property name="can-focus">True</property>
+								<property name="column-spacing">2</property>
+								<property name="row-homogeneous">True</property>
+								<child>
+									<object class="GtkImage">
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="icon-name">media-playback-stop</property>
+									</object>
+								</child>
+								<child>
+									<object class="GtkLabel">
+										<property name="visible">True</property>
+										<property name="can-focus">True</property>
+										<property name="label" translatable="yes">Stop Recording</property>
+									</object>
+								</child>
+							</object>
+						</child>
+					</object>
+				</child>
+				<child>
+					<object class="GtkButton" id="playbutton">
+						<property name="icon_name">media-playback-start</property>
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="receives-default">True</property>
+					</object>
+				</child>
+				<child type="end">
+					<object class="GtkButton" id="about_menu_item">
+						<property name="label">About</property>
+						<property name="visible">True</property>
+						<property name="can-focus">True</property>
+						<property name="receives-default">True</property>
+					</object>
+				</child>
+			</object>
+		</child>
+	</object>
+</interface>