diff --git a/ui/Base.lproj/RingWizardLinkAccount.xib b/ui/Base.lproj/RingWizardLinkAccount.xib
index af699ae..96ebc35 100644
--- a/ui/Base.lproj/RingWizardLinkAccount.xib
+++ b/ui/Base.lproj/RingWizardLinkAccount.xib
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
+        <development version="7000" identifier="xcode"/>
         <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="RingWizardLinkAccountVC">
             <connections>
                 <outlet property="createButton" destination="xmI-fH-GpH" id="VnH-tA-YA2"/>
                 <outlet property="errorContainer" destination="B0P-LC-JmW" id="lKa-Nb-o79"/>
-                <outlet property="helpContainer" destination="VJx-c6-hvT" id="dQM-IP-fmp"/>
+                <outlet property="firstStepContainer" destination="uuC-qZ-khm" id="CwE-K0-5L5"/>
                 <outlet property="initialContainer" destination="jR6-WY-o19" id="zJs-xD-OjK"/>
                 <outlet property="loadingContainer" destination="PQA-fA-Rio" id="Vgf-yn-jFS"/>
-                <outlet property="passwordField" destination="VeW-tY-k3K" id="LH6-sz-3EY"/>
-                <outlet property="passwordLabel" destination="AGs-mP-zJd" id="zc8-Rl-nuO"/>
-                <outlet property="pinField" destination="BFR-6z-UlF" id="Pd6-ML-zGH"/>
-                <outlet property="pinLabel" destination="Nms-13-N3F" id="44u-cx-UVv"/>
                 <outlet property="progressBar" destination="uxb-PD-AaW" id="r6R-U9-Kf4"/>
                 <outlet property="view" destination="kG1-xB-0op" id="gnN-lQ-sTg"/>
             </connections>
@@ -22,30 +20,30 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="kG1-xB-0op">
-            <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
+            <rect key="frame" x="0.0" y="0.0" width="355" height="222"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <view translatesAutoresizingMaskIntoConstraints="NO" id="B0P-LC-JmW">
-                    <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
+                    <rect key="frame" x="0.0" y="0.0" width="355" height="222"/>
                     <subviews>
                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hwa-xK-TuM">
-                            <rect key="frame" x="-2" y="88" width="359" height="17"/>
+                            <rect key="frame" x="-2" y="103" width="359" height="17"/>
                             <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="An error occured, please check your password and pin." id="DyG-SJ-U1Q">
                                 <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 translatesAutoresizingMaskIntoConstraints="NO" id="daZ-Bz-vsM">
-                            <rect key="frame" x="265" y="17" width="72" height="29"/>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="daZ-Bz-vsM">
+                            <rect key="frame" x="259" y="13" width="82" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="vNb-db-X99"/>
                             </constraints>
-                            <buttonCell key="cell" type="bevel" title="Cancel" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="t12-O0-kcf">
+                            <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="t12-O0-kcf">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                                 <string key="keyEquivalent" base64-UTF8="YES">
-DQ
+Gw
 </string>
                             </buttonCell>
                             <connections>
@@ -62,10 +60,10 @@
                     </constraints>
                 </view>
                 <view translatesAutoresizingMaskIntoConstraints="NO" id="PQA-fA-Rio">
-                    <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
+                    <rect key="frame" x="0.0" y="0.0" width="355" height="222"/>
                     <subviews>
                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="80Z-XU-adp">
-                            <rect key="frame" x="6" y="59" width="344" height="17"/>
+                            <rect key="frame" x="6" y="74" width="344" height="17"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="340" id="OcO-zL-LBK"/>
                             </constraints>
@@ -75,24 +73,8 @@
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="moc-jn-6gS">
-                            <rect key="frame" x="265" y="17" width="72" height="29"/>
-                            <constraints>
-                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="p5l-CE-iab"/>
-                            </constraints>
-                            <buttonCell key="cell" type="bevel" title="Cancel" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="uhy-DE-TKw">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                                <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
-                            </buttonCell>
-                            <connections>
-                                <action selector="dismissViewWithError:" target="-2" id="ZGv-8b-1B0"/>
-                            </connections>
-                        </button>
                         <progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="uxb-PD-AaW">
-                            <rect key="frame" x="130" y="116" width="96" height="32"/>
+                            <rect key="frame" x="130" y="131" width="96" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="96" id="QHN-gm-GxV"/>
                             </constraints>
@@ -100,47 +82,20 @@
                     </subviews>
                     <constraints>
                         <constraint firstItem="uxb-PD-AaW" firstAttribute="centerX" secondItem="PQA-fA-Rio" secondAttribute="centerX" id="5a0-wi-oYZ"/>
-                        <constraint firstAttribute="bottom" secondItem="moc-jn-6gS" secondAttribute="bottom" constant="20" id="ENl-ng-a12"/>
                         <constraint firstItem="uxb-PD-AaW" firstAttribute="centerY" secondItem="PQA-fA-Rio" secondAttribute="centerY" constant="-35.5" id="Reg-FH-UrX"/>
                         <constraint firstItem="uxb-PD-AaW" firstAttribute="centerX" secondItem="80Z-XU-adp" secondAttribute="centerX" id="ZiA-sz-Pnl"/>
                         <constraint firstItem="80Z-XU-adp" firstAttribute="top" secondItem="uxb-PD-AaW" secondAttribute="bottom" constant="40" id="a6L-fb-blD"/>
-                        <constraint firstAttribute="trailing" secondItem="moc-jn-6gS" secondAttribute="trailing" constant="20" id="fK2-ny-217"/>
                     </constraints>
                 </view>
-                <view translatesAutoresizingMaskIntoConstraints="NO" id="jR6-WY-o19">
-                    <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
+                <view translatesAutoresizingMaskIntoConstraints="NO" id="jR6-WY-o19" userLabel="Second step">
+                    <rect key="frame" x="0.0" y="0.0" width="355" height="222"/>
                     <subviews>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="xmI-fH-GpH">
-                            <rect key="frame" x="265" y="17" width="72" height="29"/>
-                            <constraints>
-                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="Tl8-9U-xp5"/>
-                            </constraints>
-                            <buttonCell key="cell" type="bevel" title="Next" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8b8-bt-eAj">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                                <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
-                            </buttonCell>
-                            <connections>
-                                <action selector="importRingAccount:" target="-2" id="pa7-oH-87l"/>
-                                <binding destination="-2" name="enabled" keyPath="self.passwordValue.length" id="Z1a-FR-ag2"/>
-                                <binding destination="-2" name="enabled2" keyPath="self.pinValue.length" previousBinding="Z1a-FR-ag2" id="GdE-Gd-jpJ">
-                                    <dictionary key="options">
-                                        <integer key="NSMultipleValuesPlaceholder" value="-1"/>
-                                        <integer key="NSNoSelectionPlaceholder" value="-1"/>
-                                        <integer key="NSNotApplicablePlaceholder" value="-1"/>
-                                        <integer key="NSNullPlaceholder" value="-1"/>
-                                    </dictionary>
-                                </binding>
-                            </connections>
-                        </button>
                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BFR-6z-UlF">
-                            <rect key="frame" x="78" y="124" width="200" height="22"/>
+                            <rect key="frame" x="78" y="153" width="200" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="ql3-eF-0Q3"/>
                             </constraints>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="" bezelStyle="round" id="5pW-QD-iHi">
+                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" placeholderString="" bezelStyle="round" id="5pW-QD-iHi">
                                 <font key="font" metaFont="system"/>
                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -155,12 +110,12 @@
                             </connections>
                         </textField>
                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VeW-tY-k3K" customClass="NSSecureTextField">
-                            <rect key="frame" x="78" y="65" width="200" height="22"/>
+                            <rect key="frame" x="78" y="94" width="200" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="EQr-I3-bWf"/>
                                 <constraint firstAttribute="width" constant="200" id="XLF-Bw-hQ5"/>
                             </constraints>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="" bezelStyle="round" id="9k8-c8-GFI" customClass="NSSecureTextFieldCell">
+                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" placeholderString="" bezelStyle="round" id="9k8-c8-GFI" customClass="NSSecureTextFieldCell">
                                 <font key="font" metaFont="system"/>
                                 <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -175,22 +130,33 @@
                             </connections>
                         </textField>
                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nms-13-N3F">
-                            <rect key="frame" x="76" y="156" width="198" height="17"/>
+                            <rect key="frame" x="76" y="185" width="198" height="17"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="194" id="dTT-oe-Tym"/>
                             </constraints>
-                            <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Enter your pin" id="3ik-rY-Gig">
-                                <font key="font" metaFont="system"/>
+                            <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter your PIN" id="3ik-rY-Gig">
+                                <font key="font" metaFont="systemSemibold" size="13"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                         </textField>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="XWj-I6-wlG">
-                            <rect key="frame" x="187" y="17" width="72" height="29"/>
+                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGs-mP-zJd">
+                            <rect key="frame" x="76" y="126" width="220" height="17"/>
                             <constraints>
-                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="gkI-h7-faT"/>
+                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="3tj-c0-BEv"/>
                             </constraints>
-                            <buttonCell key="cell" type="bevel" title="Cancel" bezelStyle="regularSquare" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4ev-TK-8Yt">
+                            <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter your Ring account password" id="U2K-fu-INc">
+                                <font key="font" metaFont="systemSemibold" size="13"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xmI-fH-GpH">
+                            <rect key="frame" x="261" y="13" width="80" height="32"/>
+                            <constraints>
+                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="Tl8-9U-xp5"/>
+                            </constraints>
+                            <buttonCell key="cell" type="push" title="Link" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8b8-bt-eAj">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                                 <string key="keyEquivalent" base64-UTF8="YES">
@@ -198,25 +164,119 @@
 </string>
                             </buttonCell>
                             <connections>
-                                <action selector="dismissViewWithError:" target="-2" id="TQx-1Z-tFa"/>
+                                <action selector="importRingAccount:" target="-2" id="pa7-oH-87l"/>
+                                <binding destination="-2" name="enabled" keyPath="self.passwordValue.length" id="ILY-ps-FAA">
+                                    <dictionary key="options">
+                                        <integer key="NSNullPlaceholder" value="0"/>
+                                    </dictionary>
+                                </binding>
+                                <binding destination="-2" name="enabled2" keyPath="self.pinValue.length" previousBinding="ILY-ps-FAA" id="J0B-Hr-uwj">
+                                    <dictionary key="options">
+                                        <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+                                        <integer key="NSNoSelectionPlaceholder" value="-1"/>
+                                        <integer key="NSNotApplicablePlaceholder" value="-1"/>
+                                        <integer key="NSNullPlaceholder" value="0"/>
+                                    </dictionary>
+                                </binding>
                             </connections>
                         </button>
-                        <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V74-wv-Su2">
-                            <rect key="frame" x="255" y="151" width="25" height="25"/>
-                            <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5do-zL-T0O">
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oxG-mq-q2J">
+                            <rect key="frame" x="179" y="13" width="82" height="32"/>
+                            <constraints>
+                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="jV1-fO-uj6"/>
+                            </constraints>
+                            <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Pcj-BY-tou">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
-                                <connections>
-                                    <action selector="showHelp:" target="-2" id="uXe-rC-7LO"/>
-                                </connections>
+                                <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
                             </buttonCell>
+                            <connections>
+                                <action selector="goToStepOne:" target="-2" id="vQN-I9-L2p"/>
+                            </connections>
                         </button>
-                        <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGs-mP-zJd">
-                            <rect key="frame" x="62" y="95" width="227" height="19"/>
+                    </subviews>
+                    <constraints>
+                        <constraint firstItem="BFR-6z-UlF" firstAttribute="leading" secondItem="Nms-13-N3F" secondAttribute="leading" id="8dZ-fS-u9r"/>
+                        <constraint firstItem="BFR-6z-UlF" firstAttribute="top" secondItem="Nms-13-N3F" secondAttribute="bottom" constant="10" id="9rR-Bz-IV5"/>
+                        <constraint firstItem="BFR-6z-UlF" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="B1d-wB-vV0"/>
+                        <constraint firstAttribute="bottom" secondItem="oxG-mq-q2J" secondAttribute="bottom" constant="20" id="BVR-t4-MeU"/>
+                        <constraint firstItem="VeW-tY-k3K" firstAttribute="leading" secondItem="AGs-mP-zJd" secondAttribute="leading" id="DpC-se-5c3"/>
+                        <constraint firstItem="AGs-mP-zJd" firstAttribute="top" secondItem="BFR-6z-UlF" secondAttribute="bottom" constant="10" id="Mlp-x7-UId"/>
+                        <constraint firstAttribute="bottom" secondItem="xmI-fH-GpH" secondAttribute="bottom" constant="20" id="ONV-r0-v26"/>
+                        <constraint firstItem="Nms-13-N3F" firstAttribute="top" secondItem="jR6-WY-o19" secondAttribute="top" constant="20" id="PM0-u5-7XA"/>
+                        <constraint firstItem="VeW-tY-k3K" firstAttribute="top" secondItem="AGs-mP-zJd" secondAttribute="bottom" constant="10" id="Qo1-zb-2YI"/>
+                        <constraint firstItem="xmI-fH-GpH" firstAttribute="leading" secondItem="oxG-mq-q2J" secondAttribute="trailing" constant="12" id="ZS7-xm-STi"/>
+                        <constraint firstAttribute="trailing" secondItem="xmI-fH-GpH" secondAttribute="trailing" constant="20" id="kub-6B-85y"/>
+                        <constraint firstItem="VeW-tY-k3K" firstAttribute="leading" secondItem="BFR-6z-UlF" secondAttribute="leading" id="qVJ-Qu-dRy"/>
+                        <constraint firstItem="VeW-tY-k3K" firstAttribute="trailing" secondItem="BFR-6z-UlF" secondAttribute="trailing" id="szw-nO-R5J"/>
+                    </constraints>
+                </view>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="uuC-qZ-khm" userLabel="First step">
+                    <rect key="frame" x="0.0" y="0.0" width="355" height="222"/>
+                    <subviews>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3JH-zM-ysj">
+                            <rect key="frame" x="26" y="122" width="304" height="55"/>
                             <constraints>
-                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="3tj-c0-BEv"/>
+                                <constraint firstAttribute="width" constant="300" id="28q-2A-cNP"/>
+                                <constraint firstAttribute="height" constant="55" id="YJg-LO-EmI"/>
                             </constraints>
-                            <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Enter your Ring account password" id="U2K-fu-INc">
+                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="4me-D9-6GK">
+                                <font key="font" metaFont="system"/>
+                                <string key="title">Go to the account management setting of the device, choose the Ring account to use and select "Link another device to this account".  </string>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="C9D-AI-hDL">
+                            <rect key="frame" x="13" y="97" width="149" height="17"/>
+                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="2. Generate a PIN code" id="GfW-ah-8U1">
+                                <font key="font" metaFont="systemSemibold" size="13"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4HV-K6-7nz">
+                            <rect key="frame" x="14" y="185" width="316" height="17"/>
+                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1. Grab a device with the account you want to use" id="HcT-yD-KVo">
+                                <font key="font" metaFont="systemSemibold" size="13"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                        </textField>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sFH-9q-igS">
+                            <rect key="frame" x="245" y="13" width="96" height="32"/>
+                            <buttonCell key="cell" type="push" title="I'm ready" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XN4-uc-BSt">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                                <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                            </buttonCell>
+                            <connections>
+                                <action selector="goToStepTwo:" target="-2" id="1X1-E6-Bke"/>
+                            </connections>
+                        </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XWj-I6-wlG">
+                            <rect key="frame" x="163" y="13" width="82" height="32"/>
+                            <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4ev-TK-8Yt">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                                <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                            </buttonCell>
+                            <connections>
+                                <action selector="dismissViewWithError:" target="-2" id="Mc9-wx-5Cr"/>
+                            </connections>
+                        </button>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2hL-HI-nb6">
+                            <rect key="frame" x="25" y="55" width="304" height="34"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="300" id="UJk-c7-Edh"/>
+                            </constraints>
+                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Follow the process on the device. The PIN is only valid for 10 minutes." id="2n6-m3-fbj">
                                 <font key="font" metaFont="system"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -224,30 +284,31 @@
                         </textField>
                     </subviews>
                     <constraints>
-                        <constraint firstItem="BFR-6z-UlF" firstAttribute="top" secondItem="Nms-13-N3F" secondAttribute="bottom" constant="10" id="9rR-Bz-IV5"/>
-                        <constraint firstItem="BFR-6z-UlF" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="B1d-wB-vV0"/>
-                        <constraint firstItem="V74-wv-Su2" firstAttribute="centerY" secondItem="Nms-13-N3F" secondAttribute="centerY" id="Je7-2h-AOY"/>
-                        <constraint firstItem="XWj-I6-wlG" firstAttribute="baseline" secondItem="xmI-fH-GpH" secondAttribute="baseline" id="Mew-0a-C7j"/>
-                        <constraint firstItem="AGs-mP-zJd" firstAttribute="top" secondItem="BFR-6z-UlF" secondAttribute="bottom" constant="10" id="Mlp-x7-UId"/>
-                        <constraint firstItem="V74-wv-Su2" firstAttribute="leading" secondItem="Nms-13-N3F" secondAttribute="trailing" constant="-15" id="NZC-gz-G7l"/>
-                        <constraint firstAttribute="bottom" secondItem="xmI-fH-GpH" secondAttribute="bottom" constant="20" id="ONV-r0-v26"/>
-                        <constraint firstItem="Nms-13-N3F" firstAttribute="top" secondItem="jR6-WY-o19" secondAttribute="top" constant="20" id="PM0-u5-7XA"/>
-                        <constraint firstItem="xmI-fH-GpH" firstAttribute="leading" secondItem="XWj-I6-wlG" secondAttribute="trailing" constant="10" id="Pmj-x8-RJe"/>
-                        <constraint firstItem="VeW-tY-k3K" firstAttribute="top" secondItem="AGs-mP-zJd" secondAttribute="bottom" constant="10" id="Qo1-zb-2YI"/>
-                        <constraint firstItem="Nms-13-N3F" firstAttribute="centerX" secondItem="BFR-6z-UlF" secondAttribute="centerX" constant="-3" id="Wn8-Vg-MAJ"/>
-                        <constraint firstItem="AGs-mP-zJd" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="cPy-QT-Sue"/>
-                        <constraint firstAttribute="trailing" secondItem="xmI-fH-GpH" secondAttribute="trailing" constant="20" id="kub-6B-85y"/>
-                        <constraint firstItem="VeW-tY-k3K" firstAttribute="leading" secondItem="BFR-6z-UlF" secondAttribute="leading" id="qVJ-Qu-dRy"/>
-                        <constraint firstItem="VeW-tY-k3K" firstAttribute="trailing" secondItem="BFR-6z-UlF" secondAttribute="trailing" id="szw-nO-R5J"/>
+                        <constraint firstItem="2hL-HI-nb6" firstAttribute="leading" secondItem="C9D-AI-hDL" secondAttribute="leading" constant="12" id="4qJ-oz-Qwq"/>
+                        <constraint firstItem="3JH-zM-ysj" firstAttribute="centerX" secondItem="uuC-qZ-khm" secondAttribute="centerX" id="5Cg-Gi-p1g"/>
+                        <constraint firstItem="C9D-AI-hDL" firstAttribute="top" secondItem="3JH-zM-ysj" secondAttribute="bottom" constant="8" id="5qd-XK-uAX"/>
+                        <constraint firstItem="sFH-9q-igS" firstAttribute="leading" secondItem="XWj-I6-wlG" secondAttribute="trailing" constant="12" id="CoQ-Ip-QxQ"/>
+                        <constraint firstAttribute="bottom" secondItem="XWj-I6-wlG" secondAttribute="bottom" constant="20" id="OKQ-WX-cRt"/>
+                        <constraint firstAttribute="bottom" secondItem="sFH-9q-igS" secondAttribute="bottom" constant="20" id="XHh-N4-LOF"/>
+                        <constraint firstItem="3JH-zM-ysj" firstAttribute="leading" secondItem="4HV-K6-7nz" secondAttribute="leading" constant="12" id="bGN-pW-aSN"/>
+                        <constraint firstItem="4HV-K6-7nz" firstAttribute="top" secondItem="uuC-qZ-khm" secondAttribute="top" constant="20" id="dVR-D6-0vq"/>
+                        <constraint firstItem="3JH-zM-ysj" firstAttribute="top" secondItem="4HV-K6-7nz" secondAttribute="bottom" constant="8" id="eiQ-sM-yBh"/>
+                        <constraint firstAttribute="trailing" secondItem="sFH-9q-igS" secondAttribute="trailing" constant="20" id="kqs-1M-qOD"/>
+                        <constraint firstItem="2hL-HI-nb6" firstAttribute="centerX" secondItem="uuC-qZ-khm" secondAttribute="centerX" id="pOG-8g-zAn"/>
+                        <constraint firstItem="2hL-HI-nb6" firstAttribute="top" secondItem="C9D-AI-hDL" secondAttribute="bottom" constant="8" id="ri9-m7-DGx"/>
                     </constraints>
-                </view>
+                </customView>
             </subviews>
             <constraints>
+                <constraint firstItem="uuC-qZ-khm" firstAttribute="leading" secondItem="kG1-xB-0op" secondAttribute="leading" id="3cj-EJ-8bB"/>
                 <constraint firstItem="B0P-LC-JmW" firstAttribute="top" secondItem="PQA-fA-Rio" secondAttribute="top" id="9fT-fe-XkL"/>
+                <constraint firstAttribute="trailing" secondItem="uuC-qZ-khm" secondAttribute="trailing" id="F38-q3-Lxq"/>
                 <constraint firstItem="B0P-LC-JmW" firstAttribute="trailing" secondItem="jR6-WY-o19" secondAttribute="trailing" id="GK3-rx-CoH"/>
+                <constraint firstItem="uuC-qZ-khm" firstAttribute="top" secondItem="kG1-xB-0op" secondAttribute="top" id="Isi-1I-rfF"/>
                 <constraint firstItem="PQA-fA-Rio" firstAttribute="top" secondItem="jR6-WY-o19" secondAttribute="top" id="K0Z-4r-h1X"/>
                 <constraint firstItem="jR6-WY-o19" firstAttribute="height" secondItem="kG1-xB-0op" secondAttribute="height" id="L1w-wl-tkD"/>
                 <constraint firstItem="jR6-WY-o19" firstAttribute="width" secondItem="kG1-xB-0op" secondAttribute="width" id="Ow7-Wb-jZk"/>
+                <constraint firstAttribute="bottom" secondItem="uuC-qZ-khm" secondAttribute="bottom" id="Rza-3s-JpS"/>
                 <constraint firstItem="jR6-WY-o19" firstAttribute="leading" secondItem="kG1-xB-0op" secondAttribute="leading" id="Yqh-XC-fih"/>
                 <constraint firstItem="PQA-fA-Rio" firstAttribute="trailing" secondItem="jR6-WY-o19" secondAttribute="trailing" id="aND-Hy-o8v"/>
                 <constraint firstItem="PQA-fA-Rio" firstAttribute="leading" secondItem="jR6-WY-o19" secondAttribute="leading" id="cNo-MX-1br"/>
@@ -256,45 +317,7 @@
                 <constraint firstItem="jR6-WY-o19" firstAttribute="top" secondItem="kG1-xB-0op" secondAttribute="top" id="rUX-4w-KaX"/>
                 <constraint firstItem="B0P-LC-JmW" firstAttribute="bottom" secondItem="jR6-WY-o19" secondAttribute="bottom" id="vlI-JJ-jbZ"/>
             </constraints>
-            <point key="canvasLocation" x="77.5" y="378.5"/>
-        </customView>
-        <userDefaultsController representsSharedInstance="YES" id="gsL-dH-zL7"/>
-        <viewController id="vkb-GT-Yko" userLabel="Popover View Controller">
-            <connections>
-                <outlet property="view" destination="uuC-qZ-khm" id="FPI-6k-Ebl"/>
-            </connections>
-        </viewController>
-        <popover behavior="t" id="VJx-c6-hvT">
-            <connections>
-                <outlet property="contentViewController" destination="vkb-GT-Yko" id="Ui0-tO-DXc"/>
-            </connections>
-        </popover>
-        <customView id="uuC-qZ-khm">
-            <rect key="frame" x="0.0" y="0.0" width="360" height="176"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qJX-2a-zrV">
-                    <rect key="frame" x="18" y="20" width="324" height="136"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="320" id="ZSe-1s-7bf"/>
-                    </constraints>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="dJ0-Rk-Rqr">
-                        <font key="font" metaFont="system"/>
-                        <mutableString key="title">To link this device to another account, you first need to obtain a pin code.  To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and select "Link another device to this account".  You will get the necessary pin to complete this form. The Pin is only valid for 10 minutes.</mutableString>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-            </subviews>
-            <constraints>
-                <constraint firstItem="qJX-2a-zrV" firstAttribute="leading" secondItem="uuC-qZ-khm" secondAttribute="leading" constant="20" id="JN9-ga-U2w"/>
-                <constraint firstItem="qJX-2a-zrV" firstAttribute="centerX" secondItem="uuC-qZ-khm" secondAttribute="centerX" id="bKT-Y2-imb"/>
-                <constraint firstItem="qJX-2a-zrV" firstAttribute="top" secondItem="uuC-qZ-khm" secondAttribute="top" constant="20" id="gcM-Rh-gFF"/>
-                <constraint firstAttribute="trailing" secondItem="qJX-2a-zrV" secondAttribute="trailing" constant="20" id="kd7-rz-uXG"/>
-                <constraint firstItem="qJX-2a-zrV" firstAttribute="centerY" secondItem="uuC-qZ-khm" secondAttribute="centerY" id="taw-HH-WyB"/>
-                <constraint firstAttribute="bottom" secondItem="qJX-2a-zrV" secondAttribute="bottom" constant="20" id="uoG-vi-5PS"/>
-            </constraints>
-            <point key="canvasLocation" x="303" y="677"/>
+            <point key="canvasLocation" x="340.5" y="373"/>
         </customView>
     </objects>
 </document>