diff --git a/ui/Base.lproj/ChooseAccount.xib b/ui/Base.lproj/ChooseAccount.xib
index 7ad0989..342cd77 100644
--- a/ui/Base.lproj/ChooseAccount.xib
+++ b/ui/Base.lproj/ChooseAccount.xib
@@ -10,32 +10,32 @@
             <connections>
                 <outlet property="accountSelectionButton" destination="sMr-ym-Q7q" id="aWB-iE-k1f"/>
                 <outlet property="accountStatus" destination="3O0-W6-QCM" id="5i7-92-c94"/>
-                <outlet property="profileImage" destination="JSg-rZ-Xia" id="keh-R2-VI8"/>
+                <outlet property="profileImage" destination="hJM-cr-sZ1" id="dkR-YC-SFd"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="200" height="30"/>
+            <rect key="frame" x="0.0" y="0.0" width="187" height="30"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <box boxType="custom" borderType="none" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Cvs-Qn-771">
-                    <rect key="frame" x="0.0" y="0.0" width="200" height="30"/>
+                    <rect key="frame" x="0.0" y="0.0" width="187" height="30"/>
                     <view key="contentView" id="HA7-fk-gse">
-                        <rect key="frame" x="0.0" y="0.0" width="200" height="30"/>
+                        <rect key="frame" x="0.0" y="0.0" width="187" height="30"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="JSg-rZ-Xia">
-                                <rect key="frame" x="13" y="0.0" width="30" height="30"/>
+                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hJM-cr-sZ1">
+                                <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="V0B-Kr-2Kw"/>
-                                    <constraint firstAttribute="width" constant="30" id="b29-LU-Chc"/>
+                                    <constraint firstAttribute="height" constant="30" id="icZ-2o-tSc"/>
+                                    <constraint firstAttribute="width" constant="30" id="tck-Dd-F7J"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="riX-D8-veh"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="BCQ-IL-Z8Y"/>
                             </imageView>
                             <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="3O0-W6-QCM" userLabel="AccountStatus" customClass="RoundedTextField">
-                                <rect key="frame" x="35" y="0.0" width="10" height="11"/>
+                                <rect key="frame" x="22" y="0.0" width="10" height="11"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="6.5" id="4Ks-ia-6rg"/>
                                     <constraint firstAttribute="height" constant="10.5" id="GGv-tJ-9Ps"/>
@@ -58,7 +58,7 @@
                                 </userDefinedRuntimeAttributes>
                             </textField>
                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="sMr-ym-Q7q">
-                                <rect key="frame" x="38" y="6" width="159" height="19"/>
+                                <rect key="frame" x="25" y="-2" width="159" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="155" id="RHk-BK-YeF"/>
                                 </constraints>
@@ -81,13 +81,14 @@
                             </popUpButton>
                         </subviews>
                         <constraints>
+                            <constraint firstItem="sMr-ym-Q7q" firstAttribute="centerY" secondItem="hJM-cr-sZ1" secondAttribute="centerY" id="4yN-6b-Ld4"/>
                             <constraint firstAttribute="trailing" secondItem="sMr-ym-Q7q" secondAttribute="trailing" constant="5" id="BD9-ZS-cZa"/>
-                            <constraint firstItem="sMr-ym-Q7q" firstAttribute="leading" secondItem="JSg-rZ-Xia" secondAttribute="trailing" constant="-3" id="L9t-7Q-Cw2"/>
-                            <constraint firstItem="JSg-rZ-Xia" firstAttribute="top" secondItem="HA7-fk-gse" secondAttribute="top" id="Rw2-Sd-7Hz"/>
-                            <constraint firstItem="sMr-ym-Q7q" firstAttribute="centerY" secondItem="JSg-rZ-Xia" secondAttribute="centerY" id="S2w-ph-Hue"/>
-                            <constraint firstAttribute="bottom" secondItem="JSg-rZ-Xia" secondAttribute="bottom" id="VyP-Jt-INt"/>
-                            <constraint firstItem="3O0-W6-QCM" firstAttribute="trailing" secondItem="JSg-rZ-Xia" secondAttribute="trailing" id="ogd-CG-BuC"/>
-                            <constraint firstItem="3O0-W6-QCM" firstAttribute="bottom" secondItem="JSg-rZ-Xia" secondAttribute="bottom" id="r5p-jD-VkY"/>
+                            <constraint firstItem="sMr-ym-Q7q" firstAttribute="height" secondItem="hJM-cr-sZ1" secondAttribute="height" id="GBP-lS-4lF"/>
+                            <constraint firstItem="hJM-cr-sZ1" firstAttribute="top" secondItem="HA7-fk-gse" secondAttribute="top" id="Kzn-vk-eB3"/>
+                            <constraint firstItem="hJM-cr-sZ1" firstAttribute="leading" secondItem="HA7-fk-gse" secondAttribute="leading" id="h7j-p5-yg5"/>
+                            <constraint firstItem="sMr-ym-Q7q" firstAttribute="leading" secondItem="hJM-cr-sZ1" secondAttribute="trailing" constant="-3" id="hX2-eN-HTr"/>
+                            <constraint firstItem="3O0-W6-QCM" firstAttribute="bottom" secondItem="hJM-cr-sZ1" secondAttribute="bottom" id="heW-Ck-JYo"/>
+                            <constraint firstItem="3O0-W6-QCM" firstAttribute="trailing" secondItem="hJM-cr-sZ1" secondAttribute="trailing" id="uia-pf-17R"/>
                         </constraints>
                     </view>
                 </box>