diff --git a/www/js/setup1.js b/www/js/setup1.js
index a358539..d3e1ec4 100644
--- a/www/js/setup1.js
+++ b/www/js/setup1.js
@@ -17,11 +17,12 @@ if (localStorage.getItem("firstrun") === null) {
     $(".firstrun-only").css("display", "");
 }
 
-$('#use-security').click(function () {
-    if (this.checked) {
-        $('#protocol-select').text("https://");
-    } else {
+$('#use-security-checkbox-li').click(function () {
+    // Event fires before the checkbox is changed, so we need to do the opposite
+    if ($("#use-security").prop("checked")) {
         $('#protocol-select').text("http://");
+    } else {
+        $('#protocol-select').text("https://");
     }
 });
 
diff --git a/www/pages/setup1.html b/www/pages/setup1.html
index e2598ed..c29e323 100644
--- a/www/pages/setup1.html
+++ b/www/pages/setup1.html
@@ -15,96 +15,110 @@
 
         <div class="block">
             {{#if personal}}
-            <p>Type your netsyms.com username and password.</p>
+            <div class="card">
+                <div class="card-content card-content-padding">
+                    <p>Type your netsyms.com username and password.</p>
 
-            <div class="list no-hairlines">
-                <ul>
-                    <li class="item-content item-input">
-                        <div class="item-inner">
-                            <div class="item-input-wrap">
-                                <input type="text" id="personal_username" placeholder="Username" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-                                <span class="input-clear-button"></span>
-                            </div>
-                        </div>
-                    </li>
+                    <div class="list no-hairlines">
+                        <ul>
+                            <li class="item-content item-input">
+                                <div class="item-inner">
+                                    <div class="item-title item-floating-label">Username</div>
+                                    <div class="item-input-wrap">
+                                        <input type="text" id="personal_username" placeholder="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+                                        <span class="input-clear-button"></span>
+                                    </div>
+                                </div>
+                            </li>
 
-                    <li class="item-content item-input">
-                        <div class="item-inner">
-                            <div class="item-input-wrap">
-                                <input type="password" id="personal_password" placeholder="Password" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-                                <span class="input-clear-button"></span>
-                            </div>
-                        </div>
-                    </li>
-                </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="personal_password" placeholder="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+                                        <span class="input-clear-button"></span>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
+
+                    <br />
+                    <div class="button button-fill button-raised button-round" onclick="personalsetup()">
+                        Continue
+                    </div>
+                </div>
             </div>
-
-            <div class="button button-fill" onclick="personalsetup()">
-                Continue
-            </div>
-
-            <hr />
-
-            <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>
-            {{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}}
-            <div class="row">
-                <button class="col button button-fill" onclick="scanCode()" id="scancodebtn">Scan Code</button>
-                <button class="col button" onclick="manualshow()" id="manualsetupbtn">Manual Setup</button>
+
+            <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>
+                    {{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}}
+                    <div class="row">
+                        <button class="col button button-fill button-raised button-round" onclick="scanCode()" id="scancodebtn">Scan Code</button>
+                        <button class="col button button-raised button-round" onclick="manualshow()" id="manualsetupbtn">Manual Setup</button>
+                    </div>
+
+                    <div id="manual_setup" class="block" style="display: none; padding-top: 20px; padding-bottom: 20px;">
+
+                        <div class="list">
+                            <ul>
+                                <li class="item-content item-input">
+                                    <div class="item-inner">
+                                        <div class="item-title item-floating-label">Username</div>
+                                        <div class="item-input-wrap">
+                                            <input type="text" id="username" placeholder="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+                                            <span class="input-clear-button"></span>
+                                        </div>
+                                    </div>
+                                </li>
+
+                                <li class="item-content item-input">
+                                    <div class="item-inner">
+                                        <div class="item-title item-floating-label">Key</div>
+                                        <div class="item-input-wrap">
+                                            <input type="text" id="key" placeholder="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+                                            <span class="input-clear-button"></span>
+                                        </div>
+                                    </div>
+                                </li>
+
+                                <li class="item-content item-input">
+                                    <div class="item-inner">
+                                        <div class="item-title item-floating-label" id="protocol-select">https://</div>
+                                        <div class="item-input-wrap">
+                                            <input type="url" id="syncurl" placeholder="URL" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
+                                            <span class="input-clear-button"></span>
+                                        </div>
+                                    </div>
+                                </li>
+
+                                <li id="use-security-checkbox-li">
+                                    <label class="item-checkbox item-content">
+                                        <input type="checkbox" id="use-security" checked="checked" />
+                                        <i class="icon icon-checkbox"></i>
+                                        <span class="item-inner">
+                                            <span class="item-title">Use secure connection</span>
+                                        </span>
+                                    </label>
+                                </li>
+                            </ul>
+                        </div>
+
+                        <div class="button button-fill button-raised button-round" onclick="manualsetup()">
+                            Continue
+                        </div>
+                    </div>
+
+                </div>
             </div>
 
         </div>
 
-        <div id="manual_setup" class="block" style="display: none;">
-
-            <div class="list">
-                <ul>
-                    <li class="item-content item-input">
-                        <div class="item-inner">
-                            <div class="item-input-wrap">
-                                <input type="text" id="username" placeholder="Username" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-                                <span class="input-clear-button"></span>
-                            </div>
-                        </div>
-                    </li>
-
-                    <li class="item-content item-input">
-                        <div class="item-inner">
-                            <div class="item-input-wrap">
-                                <input type="text" id="key" placeholder="Key" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-                                <span class="input-clear-button"></span>
-                            </div>
-                        </div>
-                    </li>
-
-                    <li class="item-content item-input">
-                        <div class="item-inner">
-                            <div class="item-title item-floating-label" id="protocol-select">https://</div>
-                            <div class="item-input-wrap">
-                                <input type="url" id="syncurl" placeholder="URL" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
-                                <span class="input-clear-button"></span>
-                            </div>
-                        </div>
-                    </li>
-
-                    <li>
-                        <label class="item-checkbox item-content">
-                            <input type="checkbox" id="use-security" checked="checked" />
-                            <i class="icon icon-checkbox"></i>
-                            <span class="item-inner">
-                                <span class="item-title">Use secure connection</span>
-                            </span>
-                        </label>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="button button-fill" onclick="manualsetup()">
-                Continue
-            </div>
-        </div>
-
     </div>
 
     <script src="js/setup1.js"></script>
diff --git a/www/pages/setup2.html b/www/pages/setup2.html
index 4a5925e..bf1df01 100644
--- a/www/pages/setup2.html
+++ b/www/pages/setup2.html
@@ -30,7 +30,7 @@
                 </ul>
             </div>
 
-            <button class="button button-fill" onclick="savePassword()">Finish</button>
+            <button class="button button-fill button-raised button-round" onclick="savePassword()">Finish</button>
         </div>
 
     </div>