diff --git a/css/main.css b/css/main.css
index e364e6216..86982e233 100644
--- a/css/main.css
+++ b/css/main.css
@@ -169,7 +169,7 @@ h3 {
   border-right: 2px dashed #E3E3E3;
 }
 
-@media (max-width: 1025px) {
+@media (max-width: 640px) {
   .line-dashed-v {
     border: none;
   }
@@ -347,11 +347,7 @@ hr { margin: 2.25rem 0;}
 }
 
 .box-setup {
-  padding: 20px 30px;
-  border: 1px solid #eee;
-  background: #fff;
-  overflow: hidden;
-  margin-bottom: 10px;
+  margin-bottom: 25px;
 }
 
 .box-setup-copayers {
@@ -483,19 +479,6 @@ a.loading {
  vertical-align:middle
 }
 
-fieldset {
-  border: 1px solid #eee;
-  padding: 1.11111rem;
-  margin: 1rem 0;
-}
-
-fieldset legend {
-  font-weight: bold;
-  padding: 0 0.16667rem;
-  margin: 0;
-  margin-left: -0.16667rem;
-}
-
 /* notifications */
 
 .dr-notification-container {
@@ -668,4 +651,4 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
     width: 71px;
   }
 
-}
\ No newline at end of file
+}
diff --git a/css/tpl-default.css b/css/tpl-default.css
index 47e2494f7..641788272 100644
--- a/css/tpl-default.css
+++ b/css/tpl-default.css
@@ -321,3 +321,7 @@ input.ng-invalid-wallet-secret {
   color: #3FBC9C;
 }
 
+.box-setup fieldset {
+  background: #fff;
+}
+
diff --git a/index.html b/index.html
index 5631834a3..190afa89d 100644
--- a/index.html
+++ b/index.html
@@ -276,46 +276,64 @@
         </div>
         <div ng-show="!loading">
           <form name="setupForm" ng-submit="create(setupForm)" novalidate>
-          <div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
-            <h3>Create new wallet</h3>
-            <div class="large-6 columns line-dashed-v">
-              <h6>Select total number of copayers</h6>
-              <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
-              </select>
-            </div>
-            <div class="large-6 columns">
-              <h6>Select required signatures</h6>
-              <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
-              </select>
-            </div>
-          </div>
+          <h3>Create new wallet</h3>
           <div class="row">
-            <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
+            <div class="small-12 medium-8 medium-centered large-8 large-centered columns">
+              <label>Wallet name <small>Optional</small>
+                <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
+              </label>
+            </div>
+            <div class="small-12 medium-8 medium-centered large-8 large-centered columns">
+              <div class="row">
+                <div class="small-12 medium-6 large-6 columns">
+                  <label>Your name <small>Optional</small>
+                  <input type="text" placeholder="Name" class="form-control" ng-model="myNickname">
+                  </label>
+                </div>
+                <div class="small-12 medium-6 large-6 columns">
+                  <label>Your Wallet Password <small class="has-tip" tooltip="doesn't need to be shared">Required</small>
+                  <input type="password" placeholder="Choose your password" class="form-control"
+                    ng-model="walletPassword" check-strength="walletPassword" required>
+                  </label>
+                </div>
+              </div>
+            </div>
+            <div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
+              <fieldset>
+              <div class="row">
+                <div class="large-6 medium-6 columns line-dashed-v">
+                  <label>Select total number of copayers
+                  <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
+                  </select>
+                  </label>
+                </div>
+                <div class="large-6 medium-6 columns">
+                  <label>Select required signatures
+                  <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
+                  </select>
+                  </label>
+                </div>
+              </div>
+              </fieldset>
+            </div>
+            <div class="small-12 medium-6 medium-centered large-6 large-centered columns m10b">
               <div class="box-setup-copayers">
                 <div class="box-setup-copayers-fix">
                   <img class="box-setup-copay" ng-repeat="i in getNumber(totalCopayers) track by $index" src="./img/satoshi.gif" alt="Copayer {{$index+1}}-{{totalCopayers}}" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}">
                 </div>
               </div>
             </div>
-            <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
-              <h6>Your Wallet Password<small>(doesn't need to be shared) Required</small></h6>
-              <input type="password" placeholder="Choose your password" class="form-control"
-                ng-model="walletPassword" check-strength="walletPassword" required>
-            </div>
-            <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
-              <h6>Wallet name <small>Optional</small></h6>
-                <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
-            </div>
-            <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
-              <h6>Your name <small>Optional</small></h6>
-                <input type="text" placeholder="Name" class="form-control" ng-model="myNickname">
-            </div>
           </div>
-          <div class="large-12 columns line-dashed">
-            <button type="submit" class="button primary radius right" ng-disabled="setupForm.$invalid || loading">
-             Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
-            </button>
-            <a class="button secondary radius" href="#signin">Go back</a>
+ 
+          <div class="row line-dashed">
+            <div class="large-6 medium-6 small-5 columns text-left">
+              <a class="button secondary radius" href="#signin">Go back</a>
+            </div>
+            <div class="large-6 medium-6 small-7 columns text-right">
+              <button type="submit" class="button primary radius" ng-disabled="setupForm.$invalid || loading">
+              Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
+              </button>
+            </div>
           </div>
           </form>
         </div>