diff --git a/Mac/Preferences/Accounts/AccountsDetail.xib b/Mac/Preferences/Accounts/AccountsDetail.xib
index eda4c6b3b..ed26b3b1c 100644
--- a/Mac/Preferences/Accounts/AccountsDetail.xib
+++ b/Mac/Preferences/Accounts/AccountsDetail.xib
@@ -16,75 +16,92 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <tabView id="3ki-rg-6yb">
-            <rect key="frame" x="0.0" y="0.0" width="300" height="260"/>
+            <rect key="frame" x="0.0" y="0.0" width="346" height="300"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <font key="font" metaFont="system"/>
             <tabViewItems>
                 <tabViewItem label="Account Information" identifier="" id="35c-I3-wfs">
                     <view key="view" id="ft2-Mb-5LD">
-                        <rect key="frame" x="10" y="33" width="280" height="214"/>
+                        <rect key="frame" x="10" y="33" width="326" height="254"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jiQ-KJ-SS0">
-                                <rect key="frame" x="24" y="177" width="38" height="17"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Type:" id="tC5-Vt-gBc">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XYX-iz-hnq">
-                                <rect key="frame" x="66" y="177" width="73" height="17"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" title="On My Mac" id="6yI-bV-1Sh">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ted-jN-oYR">
-                                <rect key="frame" x="18" y="150" width="44" height="17"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Name:" id="uyQ-Zi-QCr">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TT0-Kf-YTC">
-                                <rect key="frame" x="68" y="147" width="192" height="22"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="7Vp-Hq-j6n">
-                                    <font key="font" usesAppearanceFont="YES"/>
-                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mgt-uY-fuq">
-                                <rect key="frame" x="66" y="123" width="60" height="18"/>
-                                <buttonCell key="cell" type="check" title="Active" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="wxB-dX-nGt">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                    <connections>
-                                        <action selector="active:" target="-2" id="XgX-JM-UyU"/>
-                                    </connections>
-                                </buttonCell>
-                            </button>
+                            <gridView xPlacement="fill" yPlacement="center" rowAlignment="none" rowSpacing="9" columnSpacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="nVy-H3-bFO">
+                                <rect key="frame" x="20" y="163" width="286" height="71"/>
+                                <rows>
+                                    <gridRow id="yLs-SL-a1b"/>
+                                    <gridRow yPlacement="top" id="etw-2m-nWZ"/>
+                                    <gridRow id="3IT-3r-gEK"/>
+                                </rows>
+                                <columns>
+                                    <gridColumn id="sMM-Ds-SKX"/>
+                                    <gridColumn xPlacement="leading" id="Fhf-h9-g0O"/>
+                                </columns>
+                                <gridCells>
+                                    <gridCell row="yLs-SL-a1b" column="sMM-Ds-SKX" id="3ea-DE-T3i">
+                                        <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jiQ-KJ-SS0">
+                                            <rect key="frame" x="-2" y="54" width="44" height="17"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Type:" id="tC5-Vt-gBc">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                    </gridCell>
+                                    <gridCell row="yLs-SL-a1b" column="Fhf-h9-g0O" id="baI-Kp-tKF">
+                                        <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XYX-iz-hnq">
+                                            <rect key="frame" x="53" y="54" width="73" height="17"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" title="On My Mac" id="6yI-bV-1Sh">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                    </gridCell>
+                                    <gridCell row="etw-2m-nWZ" column="sMM-Ds-SKX" id="htf-Ca-Hpv"/>
+                                    <gridCell row="etw-2m-nWZ" column="Fhf-h9-g0O" id="NrD-vV-1Y1">
+                                        <button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mgt-uY-fuq">
+                                            <rect key="frame" x="53" y="29" width="60" height="18"/>
+                                            <buttonCell key="cell" type="check" title="Active" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="wxB-dX-nGt">
+                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                <font key="font" metaFont="system"/>
+                                                <connections>
+                                                    <action selector="active:" target="-2" id="XgX-JM-UyU"/>
+                                                </connections>
+                                            </buttonCell>
+                                        </button>
+                                    </gridCell>
+                                    <gridCell row="3IT-3r-gEK" column="sMM-Ds-SKX" id="2yP-oZ-A6S">
+                                        <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ted-jN-oYR">
+                                            <rect key="frame" x="-2" y="3" width="44" height="17"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Name:" id="uyQ-Zi-QCr">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                    </gridCell>
+                                    <gridCell row="3IT-3r-gEK" column="Fhf-h9-g0O" id="nCq-02-YVv">
+                                        <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TT0-Kf-YTC">
+                                            <rect key="frame" x="55" y="0.0" width="100" height="22"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="7Vp-Hq-j6n">
+                                                <font key="font" usesAppearanceFont="YES"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                    </gridCell>
+                                </gridCells>
+                            </gridView>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="mgt-uY-fuq" firstAttribute="leading" secondItem="TT0-Kf-YTC" secondAttribute="leading" id="04V-YD-UZ5"/>
-                            <constraint firstItem="mgt-uY-fuq" firstAttribute="top" secondItem="TT0-Kf-YTC" secondAttribute="bottom" constant="8" symbolic="YES" id="5Kn-79-8tn"/>
-                            <constraint firstItem="XYX-iz-hnq" firstAttribute="firstBaseline" secondItem="jiQ-KJ-SS0" secondAttribute="firstBaseline" id="8ew-wx-9n3"/>
-                            <constraint firstItem="XYX-iz-hnq" firstAttribute="leading" secondItem="jiQ-KJ-SS0" secondAttribute="trailing" constant="8" symbolic="YES" id="NsF-th-Tqq"/>
-                            <constraint firstItem="TT0-Kf-YTC" firstAttribute="leading" secondItem="XYX-iz-hnq" secondAttribute="leading" id="Xqo-JT-9KG"/>
-                            <constraint firstItem="Ted-jN-oYR" firstAttribute="trailing" secondItem="jiQ-KJ-SS0" secondAttribute="trailing" id="aHJ-FN-pUY"/>
-                            <constraint firstItem="jiQ-KJ-SS0" firstAttribute="top" secondItem="ft2-Mb-5LD" secondAttribute="top" constant="20" symbolic="YES" id="huT-H6-v8q"/>
-                            <constraint firstItem="Ted-jN-oYR" firstAttribute="leading" secondItem="ft2-Mb-5LD" secondAttribute="leading" constant="20" symbolic="YES" id="oPV-Fn-pvh"/>
-                            <constraint firstItem="TT0-Kf-YTC" firstAttribute="top" secondItem="XYX-iz-hnq" secondAttribute="bottom" constant="8" symbolic="YES" id="qSX-zc-QU7"/>
-                            <constraint firstAttribute="trailing" secondItem="TT0-Kf-YTC" secondAttribute="trailing" constant="20" symbolic="YES" id="vY4-kF-Q7P"/>
-                            <constraint firstItem="TT0-Kf-YTC" firstAttribute="firstBaseline" secondItem="Ted-jN-oYR" secondAttribute="firstBaseline" id="x1e-Qe-Q1g"/>
+                            <constraint firstItem="nVy-H3-bFO" firstAttribute="leading" secondItem="ft2-Mb-5LD" secondAttribute="leading" constant="20" symbolic="YES" id="SQe-pg-1hl"/>
+                            <constraint firstAttribute="trailing" secondItem="nVy-H3-bFO" secondAttribute="trailing" constant="20" symbolic="YES" id="Wsq-ar-poP"/>
+                            <constraint firstItem="nVy-H3-bFO" firstAttribute="top" secondItem="ft2-Mb-5LD" secondAttribute="top" constant="20" symbolic="YES" id="sy2-s4-iEW"/>
                         </constraints>
                     </view>
                 </tabViewItem>
             </tabViewItems>
-            <point key="canvasLocation" x="-333" y="88.5"/>
+            <point key="canvasLocation" x="-195" y="110"/>
         </tabView>
     </objects>
 </document>