diff --git a/public/views/create.html b/public/views/create.html
index 1250490ac..10a7aaf2f 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -119,8 +119,8 @@
                 </select>
               </label>
               <div class="oh text-gray line-b  size-12   p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
-            </div> 
--->        
+            </div>
+-->
             <label for="network-name" class="oh" ng-show="!hwLedger && !hwTrezor">
               <span translate>Testnet</span>
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
@@ -131,18 +131,13 @@
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
-            <label  for="bws" class="oh">
-              <span>Wallet Service URL</span>
-              <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
-            </label>
-
-            <label for="createPassphrase" class="line-b oh" ng-hide="setSeed || hwLedger || hwTrezor" ><span translate>Add a Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
+            <label for="createPassphrase" class="oh" ng-hide="setSeed || hwLedger || hwTrezor" ><span translate>Add a Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
               <div class="input">
-                <input type="text" class="form-control" 
+                <input type="text" class="form-control"
                 name="createPassphrase" ng-model="createPassphrase">
               </div>
             </label>
- 
+
             <label for="ext-master" class="m10t" ng-show="setSeed">
               <span translate>Wallet Seed</span>
               <small translate>Enter the seed words (BIP39)</small>
@@ -150,11 +145,16 @@
               type="text"
               name="privateKey" ng-model="privateKey">
             </label>
-            <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
+            <label for="passphrase" class="oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
               <div class="input">
                 <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
               </div>
             </label>
+
+            <label  for="bws" class="oh">
+              <span>Wallet Service URL</span>
+              <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
+            </label>
           </div>
         </div>
 
@@ -172,7 +172,7 @@
         <button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading || create.hwWallet">
           <span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span>
         </button>
-        
+
         <button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading || create.hwWallet">
           <span translate>Create new wallet</span>
         </button>
diff --git a/public/views/import.html b/public/views/import.html
index da76a2291..af03b8483 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -84,17 +84,17 @@
                 <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
               </label>
 
-              <label  for="bws" class="oh">
-                <span>Wallet Service URL</span>
-                <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
-              </label>
-
-             <label for="passphrase" class="oh line-b"><span translate>Passphrase</span>  <small translate>Wallet Seed could require a passphrase to be imported</small>
+             <label for="passphrase" class="oh"><span translate>Passphrase</span>  <small translate>Wallet Seed could require a passphrase to be imported</small>
               <div class="input">
                 <input type="password" class="form-control" placeholder="{{'Seed passphrase'|translate}}"
                 name="passphrase" ng-model="import.passphrase">
               </div>
               </label>
+
+              <label  for="bws" class="oh">
+                <span>Wallet Service URL</span>
+                <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
+              </label>
             </div>
           </div>
 
@@ -132,7 +132,7 @@
               <textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea>
             </div>
 
-            <label for="password"><span translate>Password</span> 
+            <label for="password"><span translate>Password</span>
             </label>
             <div class="input">
               <input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
@@ -157,7 +157,7 @@
                 </label>
               </div>
             </div>
-            
+
             <button translate type="submit" class="button round expand black"
               ng-disabled="importForm.$invalid || !import.password || import.loading">
               Import backup
@@ -195,7 +195,7 @@
 -->
             <button translate type="submit" class="button round expand black"
               ng-disabled="import.loading || import.ledger">
-              Import from Ledger 
+              Import from Ledger
             </button>
 
             <div class="m10t oh" ng-init="hideAdvLedger=true">
@@ -216,17 +216,12 @@
                 </label>
               </div>
             </div>
-          </div>         
+          </div>
           </form>
 
           <form name="importForm4" ng-submit="import.importTrezor(importForm4)" novalidate>
           <div class="large-12 columns">
 
-              <!-- ng-disabled="import.loading || import.ledger" -->
-            <button translate type="submit" class="button round expand black" ng-disabled="true">
-              Import from TREZOR 
-            </button> 
-
             <div class="m10t oh" ng-init="hideAdvTrezor=true">
               <a class="button outline light-gray expand tiny" ng-click="hideAdvTrezor=!hideAdvTrezor">
                 <i class="fi-widget m3r"></i>
@@ -244,13 +239,18 @@
                   <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
                 </label>
               </div>
-            </div>     
-          </div>   
+            </div>
+
+              <!-- ng-disabled="import.loading || import.ledger" -->
+            <button translate type="submit" class="button round expand black" ng-disabled="true">
+              Import from TREZOR
+            </button>
+          </div>
           </form>
- 
+
       </div>
     </div>
- 
+
 
 </div>
 
diff --git a/public/views/join.html b/public/views/join.html
index 5a7a79c00..d82c6b3ba 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -78,11 +78,6 @@
           <div ng-show="join.hideAdv" class="row">
             <div class="large-12 columns">
 
-            <label  for="bws" class="oh">
-              <span>Wallet Service URL</span>
-              <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
-            </label>
-              
             <label for="hw-ledger" class="oh" ng-show="index.isChromeApp">
               <span translate>Use Ledger hardware wallet</span>
               <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
@@ -101,20 +96,20 @@
                 </select>
               </label>
               <div class="oh text-gray line-b  size-12  p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
-            </div>  
--->       
+            </div>
+-->
             <label   ng-show="!hwLedger && !hwTrezor" for="seed" class="oh">
               <span translate>Specify your wallet seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
-            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger && !hwTrezor" ><span translate>Add a Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
+            <label for="createPassphrase" class="oh" ng-show="!setSeed && !hwLedger && !hwTrezor" ><span translate>Add a Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
               <div class="input">
-                <input type="text" class="form-control" 
+                <input type="text" class="form-control"
                 name="createPassphrase" ng-model="createPassphrase">
               </div>
             </label>
- 
+
             <label for="ext-master" class="m10t" ng-show="setSeed">
               <span translate>Wallet Seed</span>
               <small translate>Enter the seed words (BIP39)</small>
@@ -122,11 +117,16 @@
               type="text"
               name="privateKey" ng-model="privateKey">
             </label>
-            <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
+            <label for="passphrase" class="oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
               <div class="input">
                 <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
               </div>
             </label>
+
+            <label  for="bws" class="oh">
+              <span>Wallet Service URL</span>
+              <input type="text" id="bwsurl" name="bwsurl" ng-model="bwsurl">
+            </label>
           </div>
         </div>
 
@@ -139,7 +139,7 @@
           </span>
         </div>
 
-          <button translate type="submit" class="button expand black m0 round" 
+          <button translate type="submit" class="button expand black m0 round"
             ng-disabled="joinForm.$invalid || join.loading">Join</button>
       </form>
     </div>