ui: add missing layout contraints

Some xib files were broken on macOS Sierra due to missing auto layout constraints. Xcode 8 seems to mess ui using partial auto layout rules. Tuleap: #1038 Change-Id: If6d40cab6765acf0d29209aaf89911dd1bc89cd9

ui: add missing layout contraints
f86edb3d · Alexandre Lision · Alexandre Lision · 31d5cc0e · f86edb3d · f86edb3d
Commit f86edb3d authored 8 years ago by Alexandre Lision Committed by Alexandre Lision 8 years ago
--- a/ui/Base.lproj/AccGeneral.xib
+++ b/ui/Base.lproj/AccGeneral.xib
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="AccGeneralVC">
@@ -25,7 +25,7 @@
            <rect key="frame" x="0.0" y="0.0" width="582" height="380"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
            <subviews>
-                <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ej-Lr-p20">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0Ej-Lr-p20">
                    <rect key="frame" x="171" y="214" width="150" height="22"/>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="6wZ-M4-Cnf">
                        <font key="font" metaFont="system"/>
@@ -36,7 +36,7 @@
                        <outlet property="delegate" destination="-2" id="4Ow-lh-114"/>
                    </connections>
                </textField>
-                <secureTextField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="POs-9R-DUW">
+                <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="POs-9R-DUW">
                    <rect key="frame" x="171" y="174" width="150" height="22"/>
                    <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="Cvf-pZ-qe0">
                        <font key="font" metaFont="system"/>
@@ -50,7 +50,7 @@
                        <outlet property="delegate" destination="-2" id="SIP-Dy-rFh"/>
                    </connections>
                </secureTextField>
-                <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VuA-jX-Kqu">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VuA-jX-Kqu">
                    <rect key="frame" x="171" y="254" width="150" height="22"/>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="37d-ck-pa7">
                        <font key="font" metaFont="system"/>
@@ -61,31 +61,40 @@
                        <outlet property="delegate" destination="-2" id="t13-Ex-wlP"/>
                    </connections>
                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3ZB-JI-U6Y">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ZB-JI-U6Y">
                    <rect key="frame" x="103" y="179" width="62" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="58" id="yrv-IL-rAt"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password:" id="WCR-30-BX0">
                        <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>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Btb-K1-phc">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Btb-K1-phc">
                    <rect key="frame" x="56" y="257" width="109" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="105" id="aTC-B6-gvC"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Server hostname" id="3uy-g0-eCm">
                        <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>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1IP-mF-EDC">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1IP-mF-EDC">
                    <rect key="frame" x="18" y="282" width="81" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="77" id="5XB-yo-8jX"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Parameters" id="mlN-YG-fLS">
                        <font key="font" metaFont="systemBold"/>
                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Otd-nX-zTh">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="Otd-nX-zTh">
                    <rect key="frame" x="327" y="176" width="129" height="18"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="125" id="9X5-dC-041"/>
@@ -98,7 +107,7 @@
                        <action selector="showPassword:" target="-2" id="TBj-zE-GcK"/>
                    </connections>
                </button>
-                <button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x2R-Ot-MbT">
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="x2R-Ot-MbT">
                    <rect key="frame" x="323" y="208" width="137" height="32"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="125" id="YzV-yr-h9S"/>
@@ -111,24 +120,33 @@
                        <action selector="tryRegistration:" target="-2" id="wfY-tY-fc7"/>
                    </connections>
                </button>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7fA-3M-fa5">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7fA-3M-fa5">
                    <rect key="frame" x="98" y="217" width="67" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="63" id="dSc-Pa-3a2"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username" id="4Nm-hw-379">
                        <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>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h5v-jy-4zX">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h5v-jy-4zX">
-                    <rect key="frame" x="18" y="343" width="56" height="17"/>
+                    <rect key="frame" x="18" y="343" width="305" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="rNb-Ec-Ks4"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Account" id="upU-sL-9i3">
                        <font key="font" metaFont="systemBold"/>
                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ilk-QS-8PT">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ilk-QS-8PT">
                    <rect key="frame" x="171" y="315" width="150" height="22"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="150" id="3oo-Zi-5Xa"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="E5h-w4-Vl2">
                        <font key="font" metaFont="system"/>
                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -138,15 +156,18 @@
                        <outlet property="delegate" destination="-2" id="P6p-ZD-ZVC"/>
                    </connections>
                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7wz-eU-lJh">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7wz-eU-lJh">
                    <rect key="frame" x="131" y="318" width="34" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="30" id="TpO-qZ-6AX"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Alias" id="Mxv-Rt-ON6">
                        <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>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T5L-Hx-tAq">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="T5L-Hx-tAq">
                    <rect key="frame" x="30" y="110" width="426" height="18"/>
                    <buttonCell key="cell" type="check" title="Auto-answer calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="YMy-QE-7A3">
                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -156,7 +177,7 @@
                        <action selector="toggleAutoAnswer:" target="-2" id="is7-Vh-7Hf"/>
                    </connections>
                </button>
-                <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="a4o-bf-KQu">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="a4o-bf-KQu">
                    <rect key="frame" x="30" y="79" width="168" height="18"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="164" id="jr6-fZ-YC7"/>
@@ -169,8 +190,11 @@
                        <action selector="toggleCustomAgent:" target="-2" id="kY4-pJ-Wic"/>
                    </connections>
                </button>
-                <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y8K-Hi-TMC">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y8K-Hi-TMC">
                    <rect key="frame" x="204" y="77" width="131" height="22"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="131" id="qbk-dr-u8z"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="cv3-cR-i3a">
                        <font key="font" metaFont="system"/>
                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -180,7 +204,7 @@
                        <outlet property="delegate" destination="-2" id="zr5-l6-osn"/>
                    </connections>
                </textField>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rsc-fc-lz8">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="Rsc-fc-lz8">
                    <rect key="frame" x="30" y="140" width="426" height="18"/>
                    <buttonCell key="cell" type="check" title="Upnp enabled" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="N5h-tI-ZLz">
                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -190,8 +214,12 @@
                        <action selector="toggleUpnp:" target="-2" id="pl8-QR-BBc"/>
                    </connections>
                </button>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p00-of-ToC">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="p00-of-ToC">
                    <rect key="frame" x="532" y="330" width="30" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="30" id="2ib-pL-Iah"/>
+                        <constraint firstAttribute="height" constant="30" id="cbq-Gc-goJ"/>
+                    </constraints>
                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_delete" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="u1c-BX-hXL">
                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                        <font key="font" metaFont="system"/>
@@ -200,7 +228,7 @@
                        <action selector="removeAccount:" target="-2" id="uzp-ub-gsq"/>
                    </connections>
                </button>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TiO-iR-TOU">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="TiO-iR-TOU">
                    <rect key="frame" x="154" y="19" width="42" height="18"/>
                    <buttonCell key="cell" type="radio" title="SIP" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="jch-Qt-hTO">
                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -210,15 +238,18 @@
                        <action selector="toggleDTMFType:" target="-2" id="tKb-Id-onp"/>
                    </connections>
                </button>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5JS-d0-0CC">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5JS-d0-0CC">
                    <rect key="frame" x="30" y="33" width="121" height="17"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="117" id="QY2-iW-z5a"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="DTMF tone type" id="Rg8-qR-h1X">
                        <font key="font" metaFont="system"/>
                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ATi-aw-lOp">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="ATi-aw-lOp">
                    <rect key="frame" x="154" y="41" width="47" height="18"/>
                    <buttonCell key="cell" type="radio" title="RTP" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="0D8-im-2uM">
                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -230,11 +261,51 @@
                </button>
            </subviews>
            <constraints>
+                <constraint firstItem="Btb-K1-phc" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="58" id="02j-p1-vc3"/>
+                <constraint firstItem="7wz-eU-lJh" firstAttribute="baseline" secondItem="Ilk-QS-8PT" secondAttribute="baseline" id="0tS-nT-Ad3"/>
+                <constraint firstItem="TiO-iR-TOU" firstAttribute="top" secondItem="ATi-aw-lOp" secondAttribute="bottom" constant="6" symbolic="YES" id="1sm-9b-Drn"/>
+                <constraint firstItem="Ilk-QS-8PT" firstAttribute="trailing" secondItem="VuA-jX-Kqu" secondAttribute="trailing" id="6by-7J-BZq"/>
+                <constraint firstItem="T5L-Hx-tAq" firstAttribute="leading" secondItem="a4o-bf-KQu" secondAttribute="leading" id="86R-RY-X82"/>
+                <constraint firstItem="Rsc-fc-lz8" firstAttribute="leading" secondItem="T5L-Hx-tAq" secondAttribute="leading" id="AEZ-dA-ag4"/>
+                <constraint firstItem="a4o-bf-KQu" firstAttribute="leading" secondItem="5JS-d0-0CC" secondAttribute="leading" id="DcM-RL-fnb"/>
+                <constraint firstItem="Rsc-fc-lz8" firstAttribute="top" secondItem="POs-9R-DUW" secondAttribute="bottom" constant="18" id="GSg-HW-W8s"/>
+                <constraint firstItem="T5L-Hx-tAq" firstAttribute="top" secondItem="Rsc-fc-lz8" secondAttribute="bottom" constant="16" id="H5c-Bw-EuR"/>
                <constraint firstItem="POs-9R-DUW" firstAttribute="leading" secondItem="3ZB-JI-U6Y" secondAttribute="trailing" constant="8" id="I7j-dS-1py"/>
+                <constraint firstAttribute="trailing" secondItem="p00-of-ToC" secondAttribute="trailing" constant="20" symbolic="YES" id="IzJ-IM-9AB"/>
+                <constraint firstItem="Rsc-fc-lz8" firstAttribute="trailing" secondItem="T5L-Hx-tAq" secondAttribute="trailing" id="JlA-2p-9dJ"/>
+                <constraint firstItem="x2R-Ot-MbT" firstAttribute="leading" secondItem="Otd-nX-zTh" secondAttribute="leading" id="LeR-6H-gXC"/>
+                <constraint firstItem="a4o-bf-KQu" firstAttribute="baseline" secondItem="y8K-Hi-TMC" secondAttribute="baseline" id="NFa-EB-UB7"/>
+                <constraint firstItem="0Ej-Lr-p20" firstAttribute="top" secondItem="VuA-jX-Kqu" secondAttribute="bottom" constant="18" id="PBZ-M4-5sf"/>
+                <constraint firstItem="POs-9R-DUW" firstAttribute="top" secondItem="0Ej-Lr-p20" secondAttribute="bottom" constant="18" id="QTS-pp-LGa"/>
+                <constraint firstItem="POs-9R-DUW" firstAttribute="baseline" secondItem="Otd-nX-zTh" secondAttribute="baseline" id="QfC-xC-fSj"/>
+                <constraint firstItem="7fA-3M-fa5" firstAttribute="baseline" secondItem="0Ej-Lr-p20" secondAttribute="baseline" id="RcQ-vY-MNR"/>
+                <constraint firstItem="Ilk-QS-8PT" firstAttribute="leading" secondItem="VuA-jX-Kqu" secondAttribute="leading" id="ScZ-ku-Qt6"/>
+                <constraint firstItem="Btb-K1-phc" firstAttribute="top" secondItem="1IP-mF-EDC" secondAttribute="bottom" constant="8" symbolic="YES" id="TAM-s6-qAk"/>
+                <constraint firstItem="Btb-K1-phc" firstAttribute="baseline" secondItem="VuA-jX-Kqu" secondAttribute="baseline" id="a4x-68-V3a"/>
+                <constraint firstItem="5JS-d0-0CC" firstAttribute="top" secondItem="a4o-bf-KQu" secondAttribute="bottom" constant="31" id="akw-zG-Z4G"/>
                <constraint firstItem="VuA-jX-Kqu" firstAttribute="leading" secondItem="Btb-K1-phc" secondAttribute="trailing" constant="8" id="dlB-OY-I2d"/>
+                <constraint firstItem="x2R-Ot-MbT" firstAttribute="leading" secondItem="0Ej-Lr-p20" secondAttribute="trailing" constant="8" symbolic="YES" id="exl-et-srf"/>
                <constraint firstItem="0Ej-Lr-p20" firstAttribute="leading" secondItem="VuA-jX-Kqu" secondAttribute="leading" id="fSc-SN-jcG"/>
+                <constraint firstItem="Rsc-fc-lz8" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="32" id="fah-vG-Bbw"/>
+                <constraint firstItem="Ilk-QS-8PT" firstAttribute="top" secondItem="h5v-jy-4zX" secondAttribute="bottom" constant="6" id="fm7-AZ-P8e"/>
+                <constraint firstItem="a4o-bf-KQu" firstAttribute="top" secondItem="T5L-Hx-tAq" secondAttribute="bottom" constant="17" id="g8X-uT-844"/>
+                <constraint firstItem="h5v-jy-4zX" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="20" symbolic="YES" id="gQs-pR-Wa3"/>
+                <constraint firstItem="Ilk-QS-8PT" firstAttribute="leading" secondItem="7wz-eU-lJh" secondAttribute="trailing" constant="8" symbolic="YES" id="gXl-g0-zFa"/>
+                <constraint firstItem="h5v-jy-4zX" firstAttribute="top" secondItem="p00-of-ToC" secondAttribute="top" id="iP9-fP-Vgi"/>
+                <constraint firstItem="TiO-iR-TOU" firstAttribute="top" secondItem="ATi-aw-lOp" secondAttribute="bottom" constant="6" id="jWm-jt-2fo"/>
                <constraint firstItem="y8K-Hi-TMC" firstAttribute="leading" secondItem="a4o-bf-KQu" secondAttribute="trailing" constant="8" id="joX-fO-ZF6"/>
+                <constraint firstItem="h5v-jy-4zX" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" symbolic="YES" id="jvd-5E-ELU"/>
+                <constraint firstItem="ATi-aw-lOp" firstAttribute="leading" secondItem="5JS-d0-0CC" secondAttribute="trailing" constant="6" symbolic="YES" id="kqB-ur-VHO"/>
+                <constraint firstItem="VuA-jX-Kqu" firstAttribute="trailing" secondItem="0Ej-Lr-p20" secondAttribute="trailing" id="kvC-h2-4aI"/>
                <constraint firstItem="POs-9R-DUW" firstAttribute="leading" secondItem="VuA-jX-Kqu" secondAttribute="leading" id="pMK-S0-Fo4"/>
+                <constraint firstItem="ATi-aw-lOp" firstAttribute="leading" secondItem="TiO-iR-TOU" secondAttribute="leading" id="pom-Sy-lYb"/>
+                <constraint firstItem="Otd-nX-zTh" firstAttribute="leading" secondItem="POs-9R-DUW" secondAttribute="trailing" constant="8" symbolic="YES" id="u5z-hY-991"/>
+                <constraint firstItem="Otd-nX-zTh" firstAttribute="trailing" secondItem="Rsc-fc-lz8" secondAttribute="trailing" id="uS1-sG-02m"/>
+                <constraint firstItem="h5v-jy-4zX" firstAttribute="leading" secondItem="1IP-mF-EDC" secondAttribute="leading" id="vaP-I3-Bar"/>
+                <constraint firstItem="0Ej-Lr-p20" firstAttribute="top" secondItem="x2R-Ot-MbT" secondAttribute="top" id="yff-K0-lVz"/>
+                <constraint firstItem="3ZB-JI-U6Y" firstAttribute="top" secondItem="POs-9R-DUW" secondAttribute="top" id="zTM-fU-L3O"/>
+                <constraint firstItem="VuA-jX-Kqu" firstAttribute="top" secondItem="Ilk-QS-8PT" secondAttribute="bottom" constant="39" id="zXV-S3-dmt"/>
+                <constraint firstItem="ATi-aw-lOp" firstAttribute="top" secondItem="a4o-bf-KQu" secondAttribute="bottom" constant="23" id="zeU-0O-mqX"/>
                <constraint firstItem="0Ej-Lr-p20" firstAttribute="leading" secondItem="7fA-3M-fa5" secondAttribute="trailing" constant="8" id="zhV-Nm-bmz"/>
            </constraints>
            <point key="canvasLocation" x="13" y="37"/>

--- a/ui/Base.lproj/AccRing.xib
+++ b/ui/Base.lproj/AccRing.xib
--- a/ui/Base.lproj/AudioPrefs.xib
+++ b/ui/Base.lproj/AudioPrefs.xib
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
+        <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="AudioPrefsVC">
@@ -20,8 +22,8 @@
            <rect key="frame" x="0.0" y="0.0" width="465" height="255"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
            <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
-                    <rect key="frame" x="19" y="218" width="80" height="17"/>
+                    <rect key="frame" x="18" y="219" width="80" height="16"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="76" id="U53-p2-FKw"/>
                    </constraints>
@@ -31,7 +33,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
                    <rect key="frame" x="121" y="97" width="53" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="49" id="YoW-Fo-dqV"/>
@@ -42,7 +44,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="She-fN-vzD">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="She-fN-vzD">
                    <rect key="frame" x="103" y="194" width="49" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="rZa-0V-Bnx"/>
@@ -53,10 +55,11 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOg-hX-1Q5">
+                <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOg-hX-1Q5">
                    <rect key="frame" x="103" y="162" width="130" height="18"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="126" id="0X5-Ea-aDR"/>
+                        <constraint firstAttribute="height" constant="14" id="Ian-yn-0fP"/>
                    </constraints>
                    <buttonCell key="cell" type="check" title="Always recording" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="jeD-Nk-KHA">
                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -66,8 +69,11 @@
                        <action selector="toggleAlwaysRecording:" target="-2" id="sOq-tA-ZBV"/>
                    </connections>
                </button>
-                <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
                    <rect key="frame" x="178" y="92" width="206" height="26"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="201" id="vOX-51-SvC"/>
+                    </constraints>
                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="4Fp-hR-KdJ">
                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                        <font key="font" metaFont="menu"/>
@@ -81,7 +87,7 @@
                        <action selector="chooseOutput:" target="-2" id="SIh-kG-rV5"/>
                    </connections>
                </popUpButton>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bMB-Zm-k0Z">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bMB-Zm-k0Z">
                    <rect key="frame" x="20" y="124" width="99" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="95" id="D55-zT-N7E"/>
@@ -92,7 +98,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jyg-5H-Ygw">
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="Jyg-5H-Ygw">
                    <rect key="frame" x="178" y="18" width="94" height="18"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="xiQ-fa-bWr"/>
@@ -105,7 +111,7 @@
                        <action selector="toggleMuteDTMF:" target="-2" id="RNQ-D2-2m6"/>
                    </connections>
                </button>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wn2-fz-UW2">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wn2-fz-UW2">
                    <rect key="frame" x="132" y="56" width="42" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="38" id="f3z-ah-7gg"/>
@@ -116,7 +122,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bK9-uH-jDb" userLabel="Inputs">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bK9-uH-jDb" userLabel="Inputs">
                    <rect key="frame" x="178" y="51" width="206" height="26"/>
                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3mj-4K-xif">
                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -131,8 +137,11 @@
                        <action selector="chooseInput:" target="-2" id="ADO-Qj-tAz"/>
                    </connections>
                </popUpButton>
-                <pathControl verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nyE-tZ-v4C">
+                <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nyE-tZ-v4C">
                    <rect key="frame" x="152" y="190" width="210" height="26"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="204" id="UsR-SM-EYQ"/>
+                    </constraints>
                    <pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="SPB-Bz-vDM">
                        <font key="font" metaFont="system"/>
                        <url key="url" string="file://localhost/Applications/"/>
@@ -144,11 +153,28 @@
                </pathControl>
            </subviews>
            <constraints>
+                <constraint firstAttribute="trailing" secondItem="9SA-9E-IzQ" secondAttribute="trailing" constant="84" id="0Zb-hF-biO"/>
+                <constraint firstItem="ftI-JV-7cE" firstAttribute="top" secondItem="deY-JV-Rfe" secondAttribute="top" constant="20" id="3tz-DN-1lf"/>
+                <constraint firstItem="bK9-uH-jDb" firstAttribute="top" secondItem="9SA-9E-IzQ" secondAttribute="bottom" constant="20" id="B46-DU-kIx"/>
                <constraint firstItem="9SA-9E-IzQ" firstAttribute="leading" secondItem="bK9-uH-jDb" secondAttribute="leading" id="CXc-00-v8L"/>
+                <constraint firstItem="bMB-Zm-k0Z" firstAttribute="top" secondItem="kOg-hX-1Q5" secondAttribute="bottom" constant="23" id="Fo0-5T-cmf"/>
+                <constraint firstItem="bMB-Zm-k0Z" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="22" id="GhA-ij-Oet"/>
+                <constraint firstItem="She-fN-vzD" firstAttribute="baseline" secondItem="nyE-tZ-v4C" secondAttribute="firstBaseline" id="KdN-ZV-7BY"/>
+                <constraint firstItem="Y73-M5-wnx" firstAttribute="centerY" secondItem="9SA-9E-IzQ" secondAttribute="centerY" id="Njt-Kv-M05"/>
+                <constraint firstAttribute="bottom" secondItem="Jyg-5H-Ygw" secondAttribute="bottom" constant="20" symbolic="YES" id="Oln-9b-2Ri"/>
+                <constraint firstItem="ftI-JV-7cE" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="20" id="SL1-2n-Uik"/>
+                <constraint firstItem="Jyg-5H-Ygw" firstAttribute="top" secondItem="bK9-uH-jDb" secondAttribute="bottom" constant="20" id="VHA-pW-hf8"/>
+                <constraint firstItem="nyE-tZ-v4C" firstAttribute="top" secondItem="deY-JV-Rfe" secondAttribute="top" constant="41" id="dsL-QJ-MwJ"/>
+                <constraint firstItem="kOg-hX-1Q5" firstAttribute="top" secondItem="She-fN-vzD" secondAttribute="bottom" constant="16" id="fdW-vI-uOc"/>
+                <constraint firstItem="She-fN-vzD" firstAttribute="leading" secondItem="deY-JV-Rfe" secondAttribute="leading" constant="105" id="gLd-G7-ZVU"/>
                <constraint firstItem="bK9-uH-jDb" firstAttribute="leading" secondItem="wn2-fz-UW2" secondAttribute="trailing" constant="5" id="hfr-G8-btB"/>
+                <constraint firstItem="bMB-Zm-k0Z" firstAttribute="top" secondItem="ftI-JV-7cE" secondAttribute="bottom" constant="77" id="nma-zT-ejt"/>
+                <constraint firstItem="9SA-9E-IzQ" firstAttribute="trailing" secondItem="bK9-uH-jDb" secondAttribute="trailing" id="pJV-4e-1EB"/>
+                <constraint firstItem="wn2-fz-UW2" firstAttribute="centerY" secondItem="bK9-uH-jDb" secondAttribute="centerY" id="ryI-F3-Zga"/>
                <constraint firstItem="9SA-9E-IzQ" firstAttribute="leading" secondItem="Y73-M5-wnx" secondAttribute="trailing" constant="5" id="te2-Bj-JJV"/>
                <constraint firstItem="nyE-tZ-v4C" firstAttribute="leading" secondItem="She-fN-vzD" secondAttribute="trailing" constant="5" id="w8a-Pj-Dsq"/>
                <constraint firstItem="9SA-9E-IzQ" firstAttribute="leading" secondItem="Jyg-5H-Ygw" secondAttribute="leading" id="wSL-sj-u5S"/>
+                <constraint firstItem="She-fN-vzD" firstAttribute="leading" secondItem="kOg-hX-1Q5" secondAttribute="leading" id="yol-9U-IE6"/>
            </constraints>
            <point key="canvasLocation" x="170.5" y="41.5"/>
        </customView>

--- a/ui/Base.lproj/Conversation.xib
+++ b/ui/Base.lproj/Conversation.xib
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="ConversationVC">
@@ -22,17 +23,17 @@
            <rect key="frame" x="0.0" y="0.0" width="798" height="586"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
            <subviews>
-                <customView ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EJD-f8-Xqd">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="EJD-f8-Xqd">
-                    <rect key="frame" x="20" y="58" width="758" height="475"/>
+                    <rect key="frame" x="0.0" y="58" width="798" height="475"/>
                    <subviews>
-                        <scrollView ambiguous="YES" misplaced="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="Ez2-Rf-DZN">
+                        <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="Ez2-Rf-DZN">
-                            <rect key="frame" x="29" y="0.0" width="700" height="475"/>
+                            <rect key="frame" x="49" y="0.0" width="700" height="475"/>
                            <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="ofC-Bs-tHR">
                                <rect key="frame" x="0.0" y="0.0" width="700" height="475"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                <subviews>
                                    <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="hwp-Th-i2d" id="bOO-CW-S21">
-                                        <rect key="frame" x="0.0" y="0.0" width="700" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="700" height="475"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <size key="intercellSpacing" width="3" height="2"/>
                                        <color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -116,7 +117,6 @@
                                        </connections>
                                    </outlineView>
                                </subviews>
-                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                            </clipView>
                            <constraints>
                                <constraint firstAttribute="width" constant="700" id="hVv-sa-XIA"/>
@@ -186,25 +186,11 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <customView ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rth-di-Tls">
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="Rth-di-Tls">
-                    <rect key="frame" x="20" y="0.0" width="758" height="50"/>
+                    <rect key="frame" x="0.0" y="0.0" width="798" height="50"/>
                    <subviews>
-                        <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="cFH-d7-Erh" userLabel="Call Button" customClass="IconButton">
+                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2">
-                            <rect key="frame" x="20" y="5" width="40" height="40"/>
+                            <rect key="frame" x="68" y="5" width="662" height="40"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="40" id="4jd-jn-RY1"/>
-                                <constraint firstAttribute="height" constant="40" id="DMa-Lq-2Tk"/>
-                            </constraints>
-                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="XOS-rh-WfH">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="placeCall:" target="-2" id="2h9-fM-gof"/>
-                            </connections>
-                        </button>
-                        <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2">
-                            <rect key="frame" x="68" y="5" width="622" height="40"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="40" id="vko-v6-6CX"/>
                            </constraints>
@@ -225,8 +211,8 @@
                                <outlet property="delegate" destination="-2" id="2u2-D4-htz"/>
                            </connections>
                        </textField>
-                        <button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="IconButton">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="IconButton">
-                            <rect key="frame" x="698" y="5" width="40" height="40"/>
+                            <rect key="frame" x="738" y="5" width="40" height="40"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="40" id="TmF-ip-m4C"/>
                                <constraint firstAttribute="height" constant="40" id="rbQ-lE-sAq"/>
@@ -240,12 +226,30 @@
                                <binding destination="-2" name="enabled" keyPath="self.message.length" id="ZmZ-2N-CPX"/>
                            </connections>
                        </button>
+                        <button verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="cFH-d7-Erh" userLabel="Call Button" customClass="IconButton">
+                            <rect key="frame" x="20" y="5" width="40" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="40" id="4jd-jn-RY1"/>
+                                <constraint firstAttribute="height" constant="40" id="DMa-Lq-2Tk"/>
+                            </constraints>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="XOS-rh-WfH">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="placeCall:" target="-2" id="2h9-fM-gof"/>
+                            </connections>
+                        </button>
                    </subviews>
                    <constraints>
                        <constraint firstItem="cFH-d7-Erh" firstAttribute="top" secondItem="Rth-di-Tls" secondAttribute="top" constant="5" id="2zJ-2h-dLg"/>
                        <constraint firstAttribute="height" constant="50" id="8Xk-CO-d9I"/>
+                        <constraint firstItem="UJf-cF-RAo" firstAttribute="leading" secondItem="bsk-Gj-qQ2" secondAttribute="trailing" constant="8" id="ADK-NR-ZMJ"/>
                        <constraint firstItem="UJf-cF-RAo" firstAttribute="centerY" secondItem="Rth-di-Tls" secondAttribute="centerY" id="IEk-Ts-gBA"/>
+                        <constraint firstAttribute="bottom" secondItem="bsk-Gj-qQ2" secondAttribute="bottom" constant="5" id="NYK-6e-w8C"/>
                        <constraint firstItem="cFH-d7-Erh" firstAttribute="leading" secondItem="Rth-di-Tls" secondAttribute="leading" constant="20" id="TFr-St-w0Q"/>
+                        <constraint firstAttribute="trailing" secondItem="UJf-cF-RAo" secondAttribute="trailing" constant="20" id="XqO-dy-4yf"/>
+                        <constraint firstItem="bsk-Gj-qQ2" firstAttribute="top" secondItem="Rth-di-Tls" secondAttribute="top" constant="5" id="bpr-MK-LFn"/>
                        <constraint firstItem="bsk-Gj-qQ2" firstAttribute="leading" secondItem="cFH-d7-Erh" secondAttribute="trailing" constant="8" id="cMh-IX-Iur"/>
                        <constraint firstAttribute="bottom" secondItem="cFH-d7-Erh" secondAttribute="bottom" constant="5" id="xpg-xe-2dT"/>
                    </constraints>
@@ -270,11 +274,14 @@
                <constraint firstItem="Rth-di-Tls" firstAttribute="leading" secondItem="EJD-f8-Xqd" secondAttribute="leading" id="Ijp-QX-Dkw"/>
                <constraint firstItem="ucx-6g-eJw" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Pd6-AZ-mue"/>
                <constraint firstItem="Uqj-Xr-xl5" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Tzd-wA-uMM"/>
+                <constraint firstItem="xdB-aI-PSs" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ucx-6g-eJw" secondAttribute="trailing" constant="5" id="U7E-ud-cgV"/>
                <constraint firstItem="EJD-f8-Xqd" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="bvr-Gv-Sgb"/>
                <constraint firstItem="ooq-vs-Xt1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="cQe-IU-Fcd"/>
                <constraint firstItem="ooq-vs-Xt1" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="12" id="gkR-53-qs5"/>
+                <constraint firstAttribute="trailing" secondItem="Rth-di-Tls" secondAttribute="trailing" id="iT0-rG-86d"/>
                <constraint firstItem="EJD-f8-Xqd" firstAttribute="top" secondItem="ooq-vs-Xt1" secondAttribute="bottom" constant="1" id="mJI-DZ-n2l"/>
                <constraint firstItem="Rth-di-Tls" firstAttribute="trailing" secondItem="EJD-f8-Xqd" secondAttribute="trailing" id="mga-Tu-Ikb"/>
+                <constraint firstItem="Rth-di-Tls" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="qz7-sE-9Ml"/>
                <constraint firstItem="Uqj-Xr-xl5" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="tmm-4H-81S"/>
                <constraint firstItem="xdB-aI-PSs" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="21" id="yBE-OM-E6U"/>
                <constraint firstAttribute="bottom" secondItem="EJD-f8-Xqd" secondAttribute="bottom" constant="58" id="zTa-in-4Jj"/>

--- a/ui/Base.lproj/GeneralPrefs.xib
+++ b/ui/Base.lproj/GeneralPrefs.xib
--- a/ui/Base.lproj/PersonLinker.xib
+++ b/ui/Base.lproj/PersonLinker.xib
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A313a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="PersonLinkerVC">
@@ -25,6 +25,7 @@
            <subviews>
                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8pP-Sy-Vkd">
                    <rect key="frame" x="18" y="415" width="184" height="22"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                    <textFieldCell key="cell" lineBreakMode="truncatingTail" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" alignment="right" placeholderString="Contact Method" usesSingleLineMode="YES" id="a9R-r5-K3w">
                        <font key="font" size="18" name="HelveticaNeue-Thin"/>
                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -33,9 +34,11 @@
                </textField>
                <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4Dh-2q-0Sm">
                    <rect key="frame" x="0.0" y="-21" width="308" height="428"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                    <subviews>
                        <searchField wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZJY-k3-gHh">
                            <rect key="frame" x="20" y="406" width="268" height="22"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                            <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" id="sS1-2Z-ZWi">
                                <font key="font" metaFont="system"/>
                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -48,6 +51,7 @@
                        </searchField>
                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cfj-u3-ErF">
                            <rect key="frame" x="9" y="24" width="291" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                            <buttonCell key="cell" type="squareTextured" title="Add new contact" bezelStyle="texturedSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="had-9Y-eza">
                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                <font key="font" metaFont="system"/>
@@ -59,6 +63,7 @@
                        </button>
                        <scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="42" horizontalPageScroll="10" verticalLineScroll="42" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" scrollerKnobStyle="light" translatesAutoresizingMaskIntoConstraints="NO" id="sue-LK-DlA">
                            <rect key="frame" x="0.0" y="61" width="308" height="337"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                            <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="bpD-gC-mEn">
                                <rect key="frame" x="0.0" y="0.0" width="308" height="337"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -89,6 +94,7 @@
                                                        <subviews>
                                                            <textField wantsLayer="YES" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="Vix-1z-ceH">
                                                                <rect key="frame" x="60" y="20" width="219" height="23"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Display Role" id="Jcn-cg-rbR">
                                                                    <font key="font" size="16" name="HelveticaNeue-Light"/>
                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -97,6 +103,7 @@
                                                            </textField>
                                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="XdL-zf-7dn">
                                                                <rect key="frame" x="10" y="11" width="40" height="40"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="27s-no-TQR"/>
                                                            </imageView>
                                                        </subviews>
@@ -113,7 +120,6 @@
                                        </connections>
                                    </outlineView>
                                </subviews>
-                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                            </clipView>
                            <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4Sk-mY-PsD">
                                <rect key="frame" x="1" y="117" width="238" height="16"/>
@@ -128,6 +134,7 @@
                </customView>
                <comboBox verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MFf-kv-pz3">
                    <rect key="frame" x="208" y="415" width="84" height="26"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                    <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" usesDataSource="YES" numberOfVisibleItems="5" id="Msw-lx-k0J">
                        <font key="font" metaFont="system"/>
                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -143,11 +150,14 @@
            <point key="canvasLocation" x="578" y="354"/>
        </customView>
        <customView wantsLayer="YES" id="6M0-sm-haN">
-            <rect key="frame" x="0.0" y="5" width="269" height="216"/>
+            <rect key="frame" x="0.0" y="0.0" width="272" height="216"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
            <subviews>
-                <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m4N-gI-w8E">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m4N-gI-w8E">
-                    <rect key="frame" x="12" y="112" width="245" height="27"/>
+                    <rect key="frame" x="13" y="107" width="245" height="22"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="245" id="iPe-jW-Wlk"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="First name..." drawsBackground="YES" id="vyb-95-XaF">
                        <font key="font" metaFont="system"/>
                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -158,8 +168,11 @@
                        <outlet property="nextKeyView" destination="j0A-7O-Bvj" id="Ub8-NO-TRg"/>
                    </connections>
                </textField>
-                <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-7O-Bvj">
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j0A-7O-Bvj">
-                    <rect key="frame" x="12" y="75" width="245" height="27"/>
+                    <rect key="frame" x="13" y="75" width="245" height="22"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="245" id="gH8-eW-ktF"/>
+                    </constraints>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Last name..." drawsBackground="YES" id="cGT-nu-sPa">
                        <font key="font" metaFont="system"/>
                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -170,25 +183,25 @@
                        <outlet property="nextKeyView" destination="N0T-7S-TCW" id="DHp-cl-011"/>
                    </connections>
                </textField>
-                <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GgO-mM-nnz">
+                <textField wantsLayer="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GgO-mM-nnz">
-                    <rect key="frame" x="24" y="186" width="221" height="30"/>
+                    <rect key="frame" x="74" y="192" width="125" height="24"/>
                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="New Contact" id="v7b-de-MVd">
                        <font key="font" metaFont="system" size="20"/>
                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <scrollView ambiguous="YES" misplaced="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzn-cW-Vtm">
+                <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vzn-cW-Vtm">
-                    <rect key="frame" x="26" y="146" width="217" height="32"/>
+                    <rect key="frame" x="27" y="137" width="217" height="41"/>
-                    <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="2yu-GN-mus">
+                    <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="2yu-GN-mus">
-                        <rect key="frame" x="0.0" y="0.0" width="217" height="32"/>
+                        <rect key="frame" x="0.0" y="0.0" width="217" height="41"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <textView ambiguous="YES" editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="TQq-By-akw">
+                            <textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="TQq-By-akw">
-                                <rect key="frame" x="0.0" y="0.0" width="217" height="32"/>
+                                <rect key="frame" x="0.0" y="0.0" width="217" height="41"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <size key="minSize" width="217" height="32"/>
+                                <size key="minSize" width="217" height="41"/>
                                <size key="maxSize" width="463" height="10000000"/>
                                <attributedString key="textStorage">
                                    <fragment content="This contact will be added to your iCloud contacts ">
@@ -199,23 +212,27 @@
                                    </fragment>
                                </attributedString>
                                <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                <size key="minSize" width="217" height="32"/>
-                                <size key="maxSize" width="463" height="10000000"/>
                            </textView>
                        </subviews>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                    </clipView>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="41" id="evf-4R-Uy9"/>
+                        <constraint firstAttribute="width" constant="217" id="rLb-RB-QaL"/>
+                    </constraints>
                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="XUh-Co-vZc">
                        <rect key="frame" x="-100" y="-100" width="87" height="18"/>
                        <autoresizingMask key="autoresizingMask"/>
                    </scroller>
                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="C83-CS-odD">
-                        <rect key="frame" x="-16" y="0.0" width="16" height="0.0"/>
+                        <rect key="frame" x="201" y="0.0" width="16" height="41"/>
                        <autoresizingMask key="autoresizingMask"/>
                    </scroller>
                </scrollView>
-                <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="N0T-7S-TCW">
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N0T-7S-TCW">
-                    <rect key="frame" x="12" y="38" width="245" height="30"/>
+                    <rect key="frame" x="95" y="38" width="81" height="25"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="gX5-8a-8bp"/>
+                    </constraints>
                    <buttonCell key="cell" type="squareTextured" title="Create" bezelStyle="texturedSquare" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="qZc-Z2-TpP">
                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                        <font key="font" metaFont="system"/>
@@ -228,14 +245,17 @@
            </subviews>
            <constraints>
                <constraint firstAttribute="centerX" secondItem="m4N-gI-w8E" secondAttribute="centerX" id="4IS-12-aeP"/>
-                <constraint firstAttribute="trailing" secondItem="N0T-7S-TCW" secondAttribute="trailing" constant="12" id="C3n-ql-y7T"/>
+                <constraint firstItem="N0T-7S-TCW" firstAttribute="top" secondItem="j0A-7O-Bvj" secondAttribute="bottom" constant="13" id="FM4-Ux-d1v"/>
                <constraint firstAttribute="centerX" secondItem="j0A-7O-Bvj" secondAttribute="centerX" id="JAP-Mr-JWl"/>
-                <constraint firstAttribute="bottom" secondItem="N0T-7S-TCW" secondAttribute="bottom" constant="40" id="WLz-RD-syK"/>
+                <constraint firstItem="vzn-cW-Vtm" firstAttribute="top" secondItem="GgO-mM-nnz" secondAttribute="bottom" constant="14" id="RXK-45-m86"/>
+                <constraint firstItem="N0T-7S-TCW" firstAttribute="centerX" secondItem="6M0-sm-haN" secondAttribute="centerX" id="bFE-4h-t1h"/>
+                <constraint firstItem="GgO-mM-nnz" firstAttribute="top" secondItem="6M0-sm-haN" secondAttribute="top" id="ev3-6v-7uJ"/>
                <constraint firstAttribute="centerX" secondItem="vzn-cW-Vtm" secondAttribute="centerX" id="ltD-l2-ESu"/>
-                <constraint firstItem="N0T-7S-TCW" firstAttribute="leading" secondItem="6M0-sm-haN" secondAttribute="leading" constant="12" id="xWn-BX-TdQ"/>
+                <constraint firstItem="j0A-7O-Bvj" firstAttribute="top" secondItem="m4N-gI-w8E" secondAttribute="bottom" constant="10" id="oZj-eA-5pT"/>
+                <constraint firstItem="m4N-gI-w8E" firstAttribute="top" secondItem="vzn-cW-Vtm" secondAttribute="bottom" constant="8" id="teN-U3-diI"/>
                <constraint firstAttribute="centerX" secondItem="GgO-mM-nnz" secondAttribute="centerX" id="zLf-OH-9nF"/>
            </constraints>
-            <point key="canvasLocation" x="949.5" y="317"/>
+            <point key="canvasLocation" x="949" y="317"/>
        </customView>
    </objects>
 </document>
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
--- a/ui/Base.lproj/VideoPrefs.xib
+++ b/ui/Base.lproj/VideoPrefs.xib
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
    </dependencies>
    <objects>
        <customObject id="-2" userLabel="File's Owner" customClass="VideoPrefsVC">
@@ -19,8 +19,8 @@
            <rect key="frame" x="0.0" y="0.0" width="541" height="440"/>
            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
            <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FRq-3r-0WL">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FRq-3r-0WL">
-                    <rect key="frame" x="16" y="406" width="66" height="17"/>
+                    <rect key="frame" x="18" y="403" width="66" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="62" id="EZT-vC-kU5"/>
                    </constraints>
@@ -30,7 +30,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DTo-76-fYS">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DTo-76-fYS">
                    <rect key="frame" x="18" y="284" width="56" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="cDW-QA-C8K"/>
@@ -41,14 +41,14 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <customView wantsLayer="YES" canDrawConcurrently="YES" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qAJ-w8-a6Q" userLabel="Preview">
+                <customView wantsLayer="YES" canDrawConcurrently="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qAJ-w8-a6Q" userLabel="Preview">
                    <rect key="frame" x="32" y="20" width="489" height="256"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="470" id="WVf-8f-i99"/>
                        <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="256" id="cpy-ph-ToC"/>
                    </constraints>
                </customView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VWx-4c-7aF">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VWx-4c-7aF">
                    <rect key="frame" x="151" y="380" width="46" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="42" id="oUT-qc-42j"/>
@@ -59,8 +59,11 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5L8-b6-N3k" userLabel="Devices">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5L8-b6-N3k" userLabel="Devices">
                    <rect key="frame" x="201" y="375" width="189" height="26"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="184" id="WEa-DR-XtX"/>
+                    </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"/>
@@ -74,7 +77,7 @@
                        <action selector="chooseDevice:" target="-2" id="JjJ-Ul-8VM"/>
                    </connections>
                </popUpButton>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cDr-8B-RiJ">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cDr-8B-RiJ">
                    <rect key="frame" x="167" y="349" width="30" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="26" id="bvy-Cc-671"/>
@@ -85,7 +88,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="60X-MX-gun">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="60X-MX-gun">
                    <rect key="frame" x="164" y="315" width="33" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="29" id="jrh-Jr-I8X"/>
@@ -96,7 +99,7 @@
                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                    </textFieldCell>
                </textField>
-                <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Aec-P9-KNS" userLabel="Sizes">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aec-P9-KNS" userLabel="Sizes">
                    <rect key="frame" x="201" y="344" width="189" height="26"/>
                    <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"/>
@@ -111,7 +114,7 @@
                        <action selector="chooseSize:" target="-2" id="qra-Ci-Om8"/>
                    </connections>
                </popUpButton>
-                <popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e3h-qA-wZ5" userLabel="Rates">
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e3h-qA-wZ5" userLabel="Rates">
                    <rect key="frame" x="201" y="310" width="189" height="26"/>
                    <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"/>
@@ -128,16 +131,28 @@
                </popUpButton>
            </subviews>
            <constraints>
+                <constraint firstItem="Aec-P9-KNS" firstAttribute="top" secondItem="5L8-b6-N3k" secondAttribute="bottom" constant="10" symbolic="YES" id="30H-Y4-Vdk"/>
                <constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="e3h-qA-wZ5" secondAttribute="leading" id="BqB-1m-6cO"/>
                <constraint firstAttribute="trailing" secondItem="qAJ-w8-a6Q" secondAttribute="trailing" constant="20" id="EIm-N6-noX"/>
                <constraint firstItem="DTo-76-fYS" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="FJb-iY-SG3"/>
+                <constraint firstItem="FRq-3r-0WL" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="20" id="IHw-9z-VLL"/>
                <constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="5L8-b6-N3k" secondAttribute="leading" id="JRH-eb-BJz"/>
+                <constraint firstItem="5L8-b6-N3k" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="41" id="KEl-KW-FhR"/>
                <constraint firstItem="qAJ-w8-a6Q" firstAttribute="top" secondItem="DTo-76-fYS" secondAttribute="bottom" constant="8" id="LbB-2Z-j9c"/>
                <constraint firstAttribute="bottom" secondItem="qAJ-w8-a6Q" secondAttribute="bottom" constant="20" id="Sv6-Ls-4tS"/>
                <constraint firstItem="Aec-P9-KNS" firstAttribute="leading" secondItem="cDr-8B-RiJ" secondAttribute="trailing" constant="8" id="VXU-iE-bQZ"/>
                <constraint firstItem="5L8-b6-N3k" firstAttribute="leading" secondItem="VWx-4c-7aF" secondAttribute="trailing" constant="8" id="XsG-3e-CZ6"/>
+                <constraint firstItem="FRq-3r-0WL" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="20" id="YLm-bH-x5h"/>
+                <constraint firstItem="5L8-b6-N3k" firstAttribute="trailing" secondItem="Aec-P9-KNS" secondAttribute="trailing" id="YUh-dc-lfW"/>
+                <constraint firstItem="e3h-qA-wZ5" firstAttribute="top" secondItem="Aec-P9-KNS" secondAttribute="bottom" constant="13" id="cK6-VS-WcZ"/>
+                <constraint firstItem="cDr-8B-RiJ" firstAttribute="centerY" secondItem="Aec-P9-KNS" secondAttribute="centerY" id="dMC-00-cGN"/>
+                <constraint firstItem="60X-MX-gun" firstAttribute="centerY" secondItem="e3h-qA-wZ5" secondAttribute="centerY" id="efm-js-U8V"/>
+                <constraint firstItem="5L8-b6-N3k" firstAttribute="centerY" secondItem="VWx-4c-7aF" secondAttribute="centerY" id="gRq-aG-Tev"/>
                <constraint firstItem="qAJ-w8-a6Q" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="32" id="gt3-zq-vOi"/>
+                <constraint firstItem="qAJ-w8-a6Q" firstAttribute="top" secondItem="e3h-qA-wZ5" secondAttribute="bottom" constant="37" id="hX1-bK-s7J"/>
+                <constraint firstItem="5L8-b6-N3k" firstAttribute="trailing" secondItem="e3h-qA-wZ5" secondAttribute="trailing" id="jTr-3S-Lag"/>
                <constraint firstItem="e3h-qA-wZ5" firstAttribute="leading" secondItem="60X-MX-gun" secondAttribute="trailing" constant="8" id="k6I-Lc-Rfi"/>
+                <constraint firstItem="5L8-b6-N3k" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="203" id="vSx-Zv-fHl"/>
            </constraints>
            <point key="canvasLocation" x="372.5" y="257"/>
        </customView>