UI: fix preferences spacing

Change-Id: Id1ec9b80c09ebc8d3259d3a33e6e1153ece679b6
diff --git a/src/PreferencesWC.mm b/src/PreferencesWC.mm
index ca6426c..a65cdfd 100644
--- a/src/PreferencesWC.mm
+++ b/src/PreferencesWC.mm
@@ -72,9 +72,7 @@
     [[prefsContainer subviews]
      makeObjectsPerformSelector:@selector(removeFromSuperview)];
     currentVC = [[GeneralPrefsVC alloc] initWithNibName:@"GeneralPrefs" bundle:nil dataTransferModel: self.dataTransferModel avModel: self.avModel];
-
-    [self resizeWindowWithFrame:currentVC.view.frame];
-    [prefsContainer addSubview:currentVC.view];
+    [self addCurrentVC];
 }
 
 - (IBAction)displayAudio:(NSToolbarItem *)sender
@@ -82,8 +80,7 @@
     [[prefsContainer subviews]
      makeObjectsPerformSelector:@selector(removeFromSuperview)];
     currentVC = [[AudioPrefsVC alloc] initWithNibName:@"AudioPrefs" bundle:nil avModel: self.avModel];
-    [self resizeWindowWithFrame:currentVC.view.frame];
-    [prefsContainer addSubview:currentVC.view];
+    [self addCurrentVC];
 }
 
 - (IBAction)displayVideo:(NSToolbarItem *)sender
@@ -91,8 +88,25 @@
     [[prefsContainer subviews]
      makeObjectsPerformSelector:@selector(removeFromSuperview)];
     currentVC = [[VideoPrefsVC alloc] initWithNibName:@"VideoPrefs" bundle:nil avModel: self.avModel];
+    [self addCurrentVC];
+}
+
+-(void) addCurrentVC {
     [self resizeWindowWithFrame:currentVC.view.frame];
     [prefsContainer addSubview:currentVC.view];
+    currentVC.view.translatesAutoresizingMaskIntoConstraints = false;
+    [NSLayoutConstraint constraintWithItem:currentVC.view
+                                 attribute:NSLayoutAttributeCenterX
+                                 relatedBy:NSLayoutRelationEqual toItem: prefsContainer
+                                 attribute:NSLayoutAttributeCenterX
+                                multiplier:1 constant:0].active = YES;
+    [NSLayoutConstraint constraintWithItem:currentVC.view
+                                 attribute:NSLayoutAttributeTop
+                                 relatedBy:NSLayoutRelationEqual
+                                    toItem:prefsContainer
+                                 attribute:NSLayoutAttributeTop
+                                multiplier:1
+                                  constant:0].active = YES;
 }
 
 - (void) resizeWindowWithFrame:(NSRect)fr
@@ -101,7 +115,9 @@
     frame.origin.y += frame.size.height;
     frame.origin.y -= NSHeight(fr) + [self toolBarHeight] + [self titleBarHeight];
     frame.size.height = NSHeight(fr) + [self toolBarHeight];
-    frame.size.width = NSWidth(fr);
+    if (frame.size.width < NSWidth(fr)) {
+        frame.size.width = NSWidth(fr);
+    }
     frame = [NSWindow frameRectForContentRect:frame
                                          styleMask:[self.window styleMask]];
 
diff --git a/ui/Base.lproj/AudioPrefs.xib b/ui/Base.lproj/AudioPrefs.xib
index cbf5222..1c549e2 100644
--- a/ui/Base.lproj/AudioPrefs.xib
+++ b/ui/Base.lproj/AudioPrefs.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,17 +15,17 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="deY-JV-Rfe">
-            <rect key="frame" x="0.0" y="0.0" width="400" height="150"/>
+            <rect key="frame" x="0.0" y="0.0" width="400" height="216"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6OQ-wD-f0s">
-                    <rect key="frame" x="20" y="63" width="360" height="57"/>
+                    <rect key="frame" x="20" y="25" width="360" height="166"/>
                     <subviews>
-                        <stackView distribution="equalCentering" orientation="horizontal" alignment="centerY" spacing="14" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wCX-Iy-LKs">
-                            <rect key="frame" x="102" y="36" width="157" height="21"/>
+                        <stackView distribution="equalCentering" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wCX-Iy-LKs">
+                            <rect key="frame" x="104" y="146" width="153" height="20"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
-                                    <rect key="frame" x="-2" y="3" width="47" height="16"/>
+                                    <rect key="frame" x="-2" y="2" width="47" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Output" id="2gZ-Ab-XHf">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -33,7 +33,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
-                                    <rect key="frame" x="55" y="-3" width="105" height="25"/>
+                                    <rect key="frame" x="50" y="-4" width="107" height="25"/>
                                     <constraints>
                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="sdt-1V-qeL"/>
                                     </constraints>
@@ -60,11 +60,11 @@
                                 <real value="3.4028234663852886e+38"/>
                             </customSpacing>
                         </stackView>
-                        <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="14" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vmI-cp-8lh">
-                            <rect key="frame" x="102" y="0.0" width="157" height="21"/>
+                        <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vmI-cp-8lh">
+                            <rect key="frame" x="104" y="111" width="153" height="20"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wn2-fz-UW2">
-                                    <rect key="frame" x="-2" y="3" width="47" height="16"/>
+                                    <rect key="frame" x="-2" y="2" width="47" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Input" id="x1o-rT-jy6">
                                         <font key="font" metaFont="system"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -72,7 +72,7 @@
                                     </textFieldCell>
                                 </textField>
                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bK9-uH-jDb" userLabel="Inputs">
-                                    <rect key="frame" x="55" y="-3" width="105" height="25"/>
+                                    <rect key="frame" x="50" y="-4" width="107" height="25"/>
                                     <constraints>
                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="Sr2-HE-Wv7"/>
                                     </constraints>
@@ -99,26 +99,33 @@
                                 <real value="3.4028234663852886e+38"/>
                             </customSpacing>
                         </stackView>
+                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="Sld-i2-1FY">
+                            <rect key="frame" x="99" y="0.0" width="163" height="96"/>
+                        </customView>
                     </subviews>
                     <constraints>
                         <constraint firstItem="wn2-fz-UW2" firstAttribute="trailing" secondItem="Y73-M5-wnx" secondAttribute="trailing" id="2vm-nh-jOx"/>
+                        <constraint firstItem="wCX-Iy-LKs" firstAttribute="top" secondItem="6OQ-wD-f0s" secondAttribute="top" id="WLr-qG-E2V"/>
                         <constraint firstItem="wn2-fz-UW2" firstAttribute="leading" secondItem="Y73-M5-wnx" secondAttribute="leading" id="cWK-va-QC3"/>
                         <constraint firstItem="bK9-uH-jDb" firstAttribute="leading" secondItem="9SA-9E-IzQ" secondAttribute="leading" id="gIx-Aw-W1s"/>
                     </constraints>
                     <visibilityPriorities>
                         <integer value="1000"/>
                         <integer value="1000"/>
+                        <integer value="1000"/>
                     </visibilityPriorities>
                     <customSpacing>
                         <real value="3.4028234663852886e+38"/>
                         <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
                     </customSpacing>
                 </stackView>
             </subviews>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="6OQ-wD-f0s" secondAttribute="trailing" constant="20" id="68O-xI-oE7"/>
                 <constraint firstItem="6OQ-wD-f0s" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="20" id="Fox-sj-yEh"/>
-                <constraint firstItem="6OQ-wD-f0s" firstAttribute="top" secondItem="deY-JV-Rfe" secondAttribute="top" constant="30" id="e93-O3-78V"/>
+                <constraint firstAttribute="bottom" secondItem="6OQ-wD-f0s" secondAttribute="bottom" constant="25" id="JUM-x4-fZx"/>
+                <constraint firstItem="6OQ-wD-f0s" firstAttribute="top" secondItem="deY-JV-Rfe" secondAttribute="top" constant="25" id="e93-O3-78V"/>
             </constraints>
             <point key="canvasLocation" x="170.5" y="41.5"/>
         </customView>
diff --git a/ui/Base.lproj/GeneralPrefs.xib b/ui/Base.lproj/GeneralPrefs.xib
index dc93c0d..8c95dc2 100644
--- a/ui/Base.lproj/GeneralPrefs.xib
+++ b/ui/Base.lproj/GeneralPrefs.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -28,16 +28,16 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="616" height="446"/>
+            <rect key="frame" x="0.0" y="0.0" width="616" height="456"/>
             <subviews>
                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="25" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nnp-X2-Iv7" userLabel="GeneralSV">
-                    <rect key="frame" x="20" y="30" width="576" height="386"/>
+                    <rect key="frame" x="20" y="30" width="576" height="396"/>
                     <subviews>
                         <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="icG-wm-SaO" userLabel="NotificationSV">
-                            <rect key="frame" x="0.0" y="314" width="384" height="72"/>
+                            <rect key="frame" x="0.0" y="318" width="390" height="78"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RTc-Bf-fOh">
-                                    <rect key="frame" x="-2" y="55" width="97" height="17"/>
+                                    <rect key="frame" x="-2" y="62" width="97" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Notifications" id="I0d-mx-KhT">
                                         <font key="font" metaFont="systemBold"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -45,10 +45,10 @@
                                     </textFieldCell>
                                 </textField>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bEX-Xt-sSY" userLabel="NotificationsOptionSV">
-                                    <rect key="frame" x="103" y="0.0" width="281" height="72"/>
+                                    <rect key="frame" x="103" y="0.0" width="287" height="78"/>
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="Oth-up-2k2">
-                                            <rect key="frame" x="-2" y="56" width="252" height="18"/>
+                                            <rect key="frame" x="-2" y="61" width="256" height="18"/>
                                             <buttonCell key="cell" type="check" title="Enable notifications for incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uCL-ye-tsv">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -58,7 +58,7 @@
                                             </connections>
                                         </button>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="Esb-Tu-Qdy">
-                                            <rect key="frame" x="-2" y="27" width="285" height="18"/>
+                                            <rect key="frame" x="-2" y="30" width="289" height="18"/>
                                             <buttonCell key="cell" type="check" title="Enable notifications for incoming messages" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="0jV-Q4-232">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -68,7 +68,7 @@
                                             </connections>
                                         </button>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="amh-rw-Lc6">
-                                            <rect key="frame" x="-2" y="-2" width="227" height="18"/>
+                                            <rect key="frame" x="-2" y="-1" width="231" height="18"/>
                                             <buttonCell key="cell" type="check" title="Enable notifications for invitations" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Lww-Wb-yrf">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -100,10 +100,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d7j-DO-iGz" userLabel="SystemSV">
-                            <rect key="frame" x="0.0" y="246" width="380" height="43"/>
+                            <rect key="frame" x="0.0" y="246" width="386" height="47"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kb4-Bg-OAn">
-                                    <rect key="frame" x="-2" y="26" width="97" height="17"/>
+                                    <rect key="frame" x="-2" y="31" width="97" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="System" id="8xm-Tc-NMN">
                                         <font key="font" metaFont="systemBold"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -111,10 +111,10 @@
                                     </textFieldCell>
                                 </textField>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VDq-KE-O0C" userLabel="behaviourSV">
-                                    <rect key="frame" x="103" y="0.0" width="277" height="43"/>
+                                    <rect key="frame" x="103" y="0.0" width="283" height="47"/>
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="Is4-pD-LOT">
-                                            <rect key="frame" x="-2" y="27" width="281" height="18"/>
+                                            <rect key="frame" x="-2" y="30" width="285" height="18"/>
                                             <buttonCell key="cell" type="check" title="Bring Jami to foreground on incoming calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uYI-hA-JHk">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -124,7 +124,7 @@
                                             </connections>
                                         </button>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="1Nr-L4-fcd">
-                                            <rect key="frame" x="-2" y="-2" width="134" height="18"/>
+                                            <rect key="frame" x="-2" y="-1" width="138" height="18"/>
                                             <buttonCell key="cell" type="check" title="Launch on Startup" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="O2C-xR-mHF">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -154,10 +154,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="edh-vU-EH0" userLabel="ConversationSV">
-                            <rect key="frame" x="0.0" y="200" width="280" height="21"/>
+                            <rect key="frame" x="0.0" y="201" width="244" height="20"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fjx-R1-YSW">
-                                    <rect key="frame" x="-2" y="2" width="97" height="17"/>
+                                    <rect key="frame" x="-2" y="2" width="97" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Conversations" id="ZCU-sa-SEk">
                                         <font key="font" metaFont="systemBold"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -165,10 +165,10 @@
                                     </textFieldCell>
                                 </textField>
                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1hI-rV-eqy" userLabel="DownloadST">
-                                    <rect key="frame" x="103" y="0.0" width="177" height="21"/>
+                                    <rect key="frame" x="103" y="0.0" width="141" height="20"/>
                                     <subviews>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IHD-1X-sid">
-                                            <rect key="frame" x="-2" y="2" width="103" height="17"/>
+                                            <rect key="frame" x="-2" y="2" width="103" height="16"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Download folder" id="6Ye-pe-9WV">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -176,7 +176,7 @@
                                             </textFieldCell>
                                         </textField>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7bY-JW-z0U">
-                                            <rect key="frame" x="101" y="-7" width="82" height="32"/>
+                                            <rect key="frame" x="100" y="-7" width="48" height="32"/>
                                             <buttonCell key="cell" type="push" bezelStyle="rounded" image="ic_folder" imagePosition="left" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="DVe-a5-SU0">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -206,10 +206,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mwk-bH-RFF" userLabel="CallRecordingStackView">
-                            <rect key="frame" x="0.0" y="46" width="447" height="129"/>
+                            <rect key="frame" x="0.0" y="45" width="447" height="131"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qv4-ca-8Hk">
-                                    <rect key="frame" x="-2" y="112" width="97" height="17"/>
+                                    <rect key="frame" x="-2" y="115" width="97" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Call recording" id="Qb8-tb-vJd">
                                         <font key="font" metaFont="systemBold"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -217,10 +217,10 @@
                                     </textFieldCell>
                                 </textField>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pug-kr-QhZ" userLabel="RecordingOptionsStackView">
-                                    <rect key="frame" x="103" y="0.0" width="344" height="129"/>
+                                    <rect key="frame" x="103" y="0.0" width="344" height="131"/>
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="fOY-TU-ypx">
-                                            <rect key="frame" x="-2" y="113" width="139" height="18"/>
+                                            <rect key="frame" x="-2" y="114" width="143" height="18"/>
                                             <buttonCell key="cell" type="check" title="Always record calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="6zp-rh-brb">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -230,7 +230,7 @@
                                             </connections>
                                         </button>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="H87-5E-fJj">
-                                            <rect key="frame" x="-2" y="84" width="134" height="18"/>
+                                            <rect key="frame" x="-2" y="83" width="138" height="18"/>
                                             <buttonCell key="cell" type="check" title="Record local video" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="y5x-4d-E26">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
@@ -240,10 +240,10 @@
                                             </connections>
                                         </button>
                                         <stackView distribution="equalSpacing" orientation="horizontal" alignment="firstBaseline" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Khz-DU-Tde" userLabel="QualityStackView">
-                                            <rect key="frame" x="0.0" y="36" width="344" height="35"/>
+                                            <rect key="frame" x="0.0" y="35" width="344" height="34"/>
                                             <subviews>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JSi-NS-RUp">
-                                                    <rect key="frame" x="-2" y="18" width="88" height="17"/>
+                                                    <rect key="frame" x="-2" y="17" width="88" height="16"/>
                                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Quality(Kbps)" id="AOr-Cq-w57">
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -251,7 +251,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nn9-Oa-KI4">
-                                                    <rect key="frame" x="86" y="18" width="42" height="17"/>
+                                                    <rect key="frame" x="86" y="17" width="42" height="16"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="38" id="lSE-Bv-Mpj"/>
                                                     </constraints>
@@ -265,10 +265,10 @@
                                                     </connections>
                                                 </textField>
                                                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pUg-Ud-2HA">
-                                                    <rect key="frame" x="130" y="0.0" width="214" height="35"/>
+                                                    <rect key="frame" x="130" y="0.0" width="214" height="34"/>
                                                     <subviews>
                                                         <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q6a-vJ-Apt">
-                                                            <rect key="frame" x="-2" y="13" width="218" height="24"/>
+                                                            <rect key="frame" x="-2" y="8" width="218" height="28"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="214" id="jtd-jh-3iO"/>
                                                             </constraints>
@@ -299,7 +299,7 @@
                                                                 </textField>
                                                             </subviews>
                                                             <visibilityPriorities>
-                                                                <real value="1000"/>
+                                                                <integer value="1000"/>
                                                                 <integer value="1000"/>
                                                             </visibilityPriorities>
                                                             <customSpacing>
@@ -334,10 +334,10 @@
                                             </customSpacing>
                                         </stackView>
                                         <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xNK-7q-QG2" userLabel="RecordingFolderStackView">
-                                            <rect key="frame" x="0.0" y="0.0" width="190" height="21"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="190" height="20"/>
                                             <subviews>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AGg-t2-JTD">
-                                                    <rect key="frame" x="-2" y="4" width="86" height="17"/>
+                                                    <rect key="frame" x="-2" y="4" width="86" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Record folder" id="ep4-QU-rGl">
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -345,7 +345,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l0r-7I-uAz">
-                                                    <rect key="frame" x="84" y="-7" width="112" height="32"/>
+                                                    <rect key="frame" x="83" y="-7" width="114" height="32"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="G3c-F2-NV5"/>
                                                     </constraints>
@@ -392,10 +392,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Uml-aD-2RF" userLabel="UpdateSV">
-                            <rect key="frame" x="0.0" y="0.0" width="418" height="21"/>
+                            <rect key="frame" x="0.0" y="0.0" width="423" height="20"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="diX-uH-Ce8">
-                                    <rect key="frame" x="-2" y="2" width="97" height="17"/>
+                                    <rect key="frame" x="-2" y="2" width="97" height="16"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Update" id="r4u-t3-gBc">
                                         <font key="font" metaFont="systemBold"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -403,17 +403,17 @@
                                     </textFieldCell>
                                 </textField>
                                 <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ne6-Sz-sy8">
-                                    <rect key="frame" x="103" y="0.0" width="315" height="21"/>
+                                    <rect key="frame" x="103" y="0.0" width="320" height="20"/>
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="MCd-PD-kd7">
-                                            <rect key="frame" x="-2" y="2" width="217" height="18"/>
+                                            <rect key="frame" x="-2" y="1" width="221" height="18"/>
                                             <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="T3a-yx-ZaW">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                         </button>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RYP-3d-PCa" userLabel="Update interval">
-                                            <rect key="frame" x="231" y="-3" width="87" height="25"/>
+                                            <rect key="frame" x="236" y="-4" width="88" height="25"/>
                                             <popUpButtonCell key="cell" type="push" title="Monthly" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2629800" imageScaling="proportionallyDown" inset="2" selectedItem="42E-UY-qlP" id="tTF-gp-Rti">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -475,7 +475,7 @@
                 </stackView>
             </subviews>
             <constraints>
-                <constraint firstItem="Nnp-X2-Iv7" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="30" id="Tuf-Mf-LNF"/>
+                <constraint firstItem="Nnp-X2-Iv7" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="2Pa-6A-BSK"/>
                 <constraint firstAttribute="trailing" secondItem="Nnp-X2-Iv7" secondAttribute="trailing" constant="20" id="nYQ-kD-RbJ"/>
                 <constraint firstAttribute="bottom" secondItem="Nnp-X2-Iv7" secondAttribute="bottom" constant="30" id="pmP-Qe-fSV"/>
                 <constraint firstItem="Nnp-X2-Iv7" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="vjT-78-NUP"/>
diff --git a/ui/Base.lproj/VideoPrefs.xib b/ui/Base.lproj/VideoPrefs.xib
index 5f8e44e..43e21f3 100644
--- a/ui/Base.lproj/VideoPrefs.xib
+++ b/ui/Base.lproj/VideoPrefs.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,180 +17,169 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView misplaced="YES" id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="510" height="450"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="510" height="452"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="30" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1vk-ug-52j">
-                    <rect key="frame" x="20" y="25" width="470" height="408"/>
+                <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="25" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1vk-ug-52j">
+                    <rect key="frame" x="20" y="25" width="470" height="402"/>
                     <subviews>
-                        <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hdZ-nu-7fH">
-                            <rect key="frame" x="0.0" y="286" width="470" height="122"/>
+                        <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3fc-oM-S8e">
+                            <rect key="frame" x="82" y="281" width="307" height="121"/>
                             <subviews>
-                                <stackView distribution="fill" orientation="vertical" alignment="trailing" spacing="15" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3fc-oM-S8e">
-                                    <rect key="frame" x="112" y="0.0" width="247" height="122"/>
+                                <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m9S-Pr-8hc">
+                                    <rect key="frame" x="0.0" y="101" width="307" height="20"/>
                                     <subviews>
-                                        <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m9S-Pr-8hc">
-                                            <rect key="frame" x="0.0" y="101" width="247" height="21"/>
-                                            <subviews>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VWx-4c-7aF">
-                                                    <rect key="frame" x="-2" y="3" width="46" height="16"/>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Device" id="170-NP-CSP">
-                                                        <font key="font" metaFont="system"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
-                                                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5L8-b6-N3k" userLabel="Devices">
-                                                    <rect key="frame" x="48" y="-3" width="202" height="25"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="j4P-kB-KdU"/>
-                                                    </constraints>
-                                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="6Vf-hb-26C">
-                                                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" metaFont="menu"/>
-                                                        <menu key="menu" id="zJ9-1a-cpr">
-                                                            <connections>
-                                                                <outlet property="delegate" destination="-2" id="mF2-Zc-wNP"/>
-                                                            </connections>
-                                                        </menu>
-                                                    </popUpButtonCell>
-                                                    <connections>
-                                                        <action selector="chooseDevice:" target="-2" id="JjJ-Ul-8VM"/>
-                                                    </connections>
-                                                </popUpButton>
-                                            </subviews>
-                                            <visibilityPriorities>
-                                                <integer value="1000"/>
-                                                <integer value="1000"/>
-                                            </visibilityPriorities>
-                                            <customSpacing>
-                                                <real value="3.4028234663852886e+38"/>
-                                                <real value="3.4028234663852886e+38"/>
-                                            </customSpacing>
-                                        </stackView>
-                                        <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rSf-PH-9Ug">
-                                            <rect key="frame" x="0.0" y="65" width="247" height="21"/>
-                                            <subviews>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cDr-8B-RiJ">
-                                                    <rect key="frame" x="-2" y="3" width="46" height="16"/>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Size" id="4bq-ls-mCp">
-                                                        <font key="font" metaFont="system"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
-                                                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aec-P9-KNS" userLabel="Sizes">
-                                                    <rect key="frame" x="48" y="-3" width="202" height="25"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="qaU-o7-Vu1"/>
-                                                    </constraints>
-                                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="6ly-dX-MT4">
-                                                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" metaFont="menu"/>
-                                                        <menu key="menu" id="ykd-50-las">
-                                                            <connections>
-                                                                <outlet property="delegate" destination="-2" id="5cI-wH-0AT"/>
-                                                            </connections>
-                                                        </menu>
-                                                    </popUpButtonCell>
-                                                    <connections>
-                                                        <action selector="chooseSize:" target="-2" id="qra-Ci-Om8"/>
-                                                    </connections>
-                                                </popUpButton>
-                                            </subviews>
-                                            <visibilityPriorities>
-                                                <integer value="1000"/>
-                                                <integer value="1000"/>
-                                            </visibilityPriorities>
-                                            <customSpacing>
-                                                <real value="3.4028234663852886e+38"/>
-                                                <real value="3.4028234663852886e+38"/>
-                                            </customSpacing>
-                                        </stackView>
-                                        <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J6H-65-Ftu">
-                                            <rect key="frame" x="0.0" y="29" width="247" height="21"/>
-                                            <subviews>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="60X-MX-gun">
-                                                    <rect key="frame" x="-2" y="3" width="46" height="16"/>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Rate" id="5Im-df-jdd">
-                                                        <font key="font" metaFont="system"/>
-                                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
-                                                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e3h-qA-wZ5" userLabel="Rates">
-                                                    <rect key="frame" x="48" y="-3" width="202" height="25"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="kuH-jK-uRl"/>
-                                                    </constraints>
-                                                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="pDt-c4-Fhs">
-                                                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" metaFont="menu"/>
-                                                        <menu key="menu" id="aKL-76-vSP">
-                                                            <connections>
-                                                                <outlet property="delegate" destination="-2" id="5Gu-bg-y3C"/>
-                                                            </connections>
-                                                        </menu>
-                                                    </popUpButtonCell>
-                                                    <connections>
-                                                        <action selector="chooseRate:" target="-2" id="nye-jT-0NU"/>
-                                                    </connections>
-                                                </popUpButton>
-                                            </subviews>
-                                            <visibilityPriorities>
-                                                <integer value="1000"/>
-                                                <integer value="1000"/>
-                                            </visibilityPriorities>
-                                            <customSpacing>
-                                                <real value="3.4028234663852886e+38"/>
-                                                <real value="3.4028234663852886e+38"/>
-                                            </customSpacing>
-                                        </stackView>
-                                        <button translatesAutoresizingMaskIntoConstraints="NO" id="1hl-Ib-SGY">
-                                            <rect key="frame" x="48" y="-2" width="201" height="18"/>
-                                            <buttonCell key="cell" type="check" title="Enable hardware acceleration" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="e7y-eV-Gsz">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VWx-4c-7aF">
+                                            <rect key="frame" x="-2" y="2" width="46" height="16"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Device" id="170-NP-CSP">
                                                 <font key="font" metaFont="system"/>
-                                            </buttonCell>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5L8-b6-N3k" userLabel="Devices">
+                                            <rect key="frame" x="49" y="-4" width="262" height="25"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="j4P-kB-KdU"/>
+                                            </constraints>
+                                            <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="6Vf-hb-26C">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="menu"/>
+                                                <menu key="menu" id="zJ9-1a-cpr">
+                                                    <connections>
+                                                        <outlet property="delegate" destination="-2" id="mF2-Zc-wNP"/>
+                                                    </connections>
+                                                </menu>
+                                            </popUpButtonCell>
                                             <connections>
-                                                <action selector="toggleHardwareAcceleration:" target="-2" id="w58-qW-HGp"/>
+                                                <action selector="chooseDevice:" target="-2" id="JjJ-Ul-8VM"/>
                                             </connections>
-                                        </button>
+                                        </popUpButton>
                                     </subviews>
-                                    <constraints>
-                                        <constraint firstItem="Aec-P9-KNS" firstAttribute="trailing" secondItem="5L8-b6-N3k" secondAttribute="trailing" id="Cg8-bJ-Jb7"/>
-                                        <constraint firstItem="60X-MX-gun" firstAttribute="leading" secondItem="VWx-4c-7aF" secondAttribute="leading" id="Ejt-Kn-Wok"/>
-                                        <constraint firstItem="e3h-qA-wZ5" firstAttribute="leading" secondItem="1hl-Ib-SGY" secondAttribute="leading" id="Jgc-KS-R4a"/>
-                                        <constraint firstItem="e3h-qA-wZ5" firstAttribute="leading" secondItem="5L8-b6-N3k" secondAttribute="leading" id="QvZ-Me-RfB"/>
-                                        <constraint firstItem="cDr-8B-RiJ" firstAttribute="leading" secondItem="VWx-4c-7aF" secondAttribute="leading" id="TUj-rx-PyN"/>
-                                        <constraint firstItem="cDr-8B-RiJ" firstAttribute="trailing" secondItem="VWx-4c-7aF" secondAttribute="trailing" id="XcK-XP-tvT"/>
-                                        <constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="5L8-b6-N3k" secondAttribute="leading" id="YOZ-po-uDq"/>
-                                        <constraint firstItem="60X-MX-gun" firstAttribute="trailing" secondItem="VWx-4c-7aF" secondAttribute="trailing" id="y00-ix-aDj"/>
-                                        <constraint firstItem="e3h-qA-wZ5" firstAttribute="trailing" secondItem="5L8-b6-N3k" secondAttribute="trailing" id="yIO-9k-6sF"/>
-                                    </constraints>
                                     <visibilityPriorities>
                                         <integer value="1000"/>
                                         <integer value="1000"/>
-                                        <integer value="1000"/>
-                                        <integer value="1000"/>
                                     </visibilityPriorities>
                                     <customSpacing>
                                         <real value="3.4028234663852886e+38"/>
                                         <real value="3.4028234663852886e+38"/>
+                                    </customSpacing>
+                                </stackView>
+                                <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rSf-PH-9Ug">
+                                    <rect key="frame" x="0.0" y="66" width="307" height="20"/>
+                                    <subviews>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cDr-8B-RiJ">
+                                            <rect key="frame" x="-2" y="2" width="46" height="16"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Size" id="4bq-ls-mCp">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aec-P9-KNS" userLabel="Sizes">
+                                            <rect key="frame" x="49" y="-4" width="262" height="25"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="qaU-o7-Vu1"/>
+                                            </constraints>
+                                            <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="6ly-dX-MT4">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="menu"/>
+                                                <menu key="menu" id="ykd-50-las">
+                                                    <connections>
+                                                        <outlet property="delegate" destination="-2" id="5cI-wH-0AT"/>
+                                                    </connections>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <action selector="chooseSize:" target="-2" id="qra-Ci-Om8"/>
+                                            </connections>
+                                        </popUpButton>
+                                    </subviews>
+                                    <visibilityPriorities>
+                                        <integer value="1000"/>
+                                        <integer value="1000"/>
+                                    </visibilityPriorities>
+                                    <customSpacing>
                                         <real value="3.4028234663852886e+38"/>
                                         <real value="3.4028234663852886e+38"/>
                                     </customSpacing>
                                 </stackView>
+                                <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J6H-65-Ftu">
+                                    <rect key="frame" x="0.0" y="31" width="307" height="20"/>
+                                    <subviews>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="60X-MX-gun">
+                                            <rect key="frame" x="-2" y="2" width="46" height="16"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Rate" id="5Im-df-jdd">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e3h-qA-wZ5" userLabel="Rates">
+                                            <rect key="frame" x="49" y="-4" width="262" height="25"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="kuH-jK-uRl"/>
+                                            </constraints>
+                                            <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="pDt-c4-Fhs">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="menu"/>
+                                                <menu key="menu" id="aKL-76-vSP">
+                                                    <connections>
+                                                        <outlet property="delegate" destination="-2" id="5Gu-bg-y3C"/>
+                                                    </connections>
+                                                </menu>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <action selector="chooseRate:" target="-2" id="nye-jT-0NU"/>
+                                            </connections>
+                                        </popUpButton>
+                                    </subviews>
+                                    <visibilityPriorities>
+                                        <integer value="1000"/>
+                                        <integer value="1000"/>
+                                    </visibilityPriorities>
+                                    <customSpacing>
+                                        <real value="3.4028234663852886e+38"/>
+                                        <real value="3.4028234663852886e+38"/>
+                                    </customSpacing>
+                                </stackView>
+                                <button translatesAutoresizingMaskIntoConstraints="NO" id="1hl-Ib-SGY">
+                                    <rect key="frame" x="50" y="-1" width="205" height="18"/>
+                                    <buttonCell key="cell" type="check" title="Enable hardware acceleration" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="e7y-eV-Gsz">
+                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                        <font key="font" metaFont="system"/>
+                                    </buttonCell>
+                                    <connections>
+                                        <action selector="toggleHardwareAcceleration:" target="-2" id="w58-qW-HGp"/>
+                                    </connections>
+                                </button>
                             </subviews>
+                            <constraints>
+                                <constraint firstItem="Aec-P9-KNS" firstAttribute="trailing" secondItem="5L8-b6-N3k" secondAttribute="trailing" id="Cg8-bJ-Jb7"/>
+                                <constraint firstItem="60X-MX-gun" firstAttribute="leading" secondItem="VWx-4c-7aF" secondAttribute="leading" id="Ejt-Kn-Wok"/>
+                                <constraint firstItem="e3h-qA-wZ5" firstAttribute="leading" secondItem="1hl-Ib-SGY" secondAttribute="leading" id="Jgc-KS-R4a"/>
+                                <constraint firstItem="e3h-qA-wZ5" firstAttribute="leading" secondItem="5L8-b6-N3k" secondAttribute="leading" id="QvZ-Me-RfB"/>
+                                <constraint firstItem="cDr-8B-RiJ" firstAttribute="leading" secondItem="VWx-4c-7aF" secondAttribute="leading" id="TUj-rx-PyN"/>
+                                <constraint firstItem="cDr-8B-RiJ" firstAttribute="trailing" secondItem="VWx-4c-7aF" secondAttribute="trailing" id="XcK-XP-tvT"/>
+                                <constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="5L8-b6-N3k" secondAttribute="leading" id="YOZ-po-uDq"/>
+                                <constraint firstItem="60X-MX-gun" firstAttribute="trailing" secondItem="VWx-4c-7aF" secondAttribute="trailing" id="y00-ix-aDj"/>
+                                <constraint firstItem="e3h-qA-wZ5" firstAttribute="trailing" secondItem="5L8-b6-N3k" secondAttribute="trailing" id="yIO-9k-6sF"/>
+                            </constraints>
                             <visibilityPriorities>
                                 <integer value="1000"/>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
+                                <integer value="1000"/>
                             </visibilityPriorities>
                             <customSpacing>
                                 <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
+                                <real value="3.4028234663852886e+38"/>
                             </customSpacing>
                         </stackView>
-                        <customView wantsLayer="YES" canDrawConcurrently="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qAJ-w8-a6Q" userLabel="Preview" customClass="RenderingView">
+                        <customView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qAJ-w8-a6Q" userLabel="Preview" customClass="RenderingView">
                             <rect key="frame" x="0.0" y="0.0" width="470" height="256"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="470" id="ipm-Al-OAC"/>
@@ -198,11 +187,6 @@
                             </constraints>
                         </customView>
                     </subviews>
-                    <constraints>
-                        <constraint firstItem="hdZ-nu-7fH" firstAttribute="top" secondItem="1vk-ug-52j" secondAttribute="top" id="79w-O3-uLd"/>
-                        <constraint firstAttribute="trailing" secondItem="hdZ-nu-7fH" secondAttribute="trailing" id="Qp5-4n-aEZ"/>
-                        <constraint firstItem="hdZ-nu-7fH" firstAttribute="leading" secondItem="1vk-ug-52j" secondAttribute="leading" id="RqC-20-kgJ"/>
-                    </constraints>
                     <visibilityPriorities>
                         <integer value="1000"/>
                         <integer value="1000"/>