diff --git a/www/pages/setup1.html b/www/pages/setup1.html
index 59ac330..4d0ad34 100644
--- a/www/pages/setup1.html
+++ b/www/pages/setup1.html
@@ -54,12 +54,14 @@
                     </div>
                 </div>
             </div>
+
+            <p style="text-align: center; font-size: 120%;">- or -</p>
             {{/if}}
 
             <div class="card">
                 <div class="card-content card-content-padding">
                     {{#if personal}}
-                    <p>Or, scan a QR code with your phone camera.  Open your account dashboard on another device (like a computer) and go to Sync settings.  Generate a mobile sync code, then press the button below to scan it.</p>
+                    <p>Scan a QR code with your phone camera.  Open your account dashboard on another device (like a computer) and go to Sync settings.  Generate a mobile sync code, then press the button below to scan it.</p>
                     {{else}}
                     <p>Open AccountHub on another device and go to Sync settings.  Generate a mobile sync code, then press the button below to scan it.</p>
                     {{/if}}
diff --git a/www/pages/setup2.html b/www/pages/setup2.html
index e289936..69d6ba7 100644
--- a/www/pages/setup2.html
+++ b/www/pages/setup2.html
@@ -19,23 +19,28 @@
     <div class="page-content">
 
         <div class="block">
-            <p>Enter your password, then tap Finish.</p>
+            <div class="card">
+                <div class="card-content card-content-padding">
+                    <p>Enter your password, then tap Finish.</p>
 
-            <div class="list">
-                <ul>
-                    <li class="item-content item-input">
-                        <div class="item-media"><i class="fas fa-key"></i></div>
-                        <div class="item-inner">
-                            <div class="item-input-wrap">
-                                <input type="password" id="passbox" placeholder="Password">
-                                <span class="input-clear-button"></span>
-                            </div>
-                        </div>
-                    </li>
-                </ul>
+                    <div class="list no-hairlines">
+                        <ul>
+                            <li class="item-content item-input">
+                                <div class="item-inner">
+                                    <div class="item-title item-floating-label">Password</div>
+                                    <div class="item-input-wrap">
+                                        <input type="password" id="passbox" placeholder="">
+                                        <span class="input-clear-button"></span>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+
+                    <br />
+                    <button class="button button-fill button-raised button-round" onclick="savePassword()">Finish</button>
+                </div>
             </div>
-
-            <button class="button button-fill button-raised button-round" onclick="savePassword()">Finish</button>
         </div>
 
     </div>