diff --git a/views/create.html b/views/create.html
index 1f6e21dbb..5c2535aab 100644
--- a/views/create.html
+++ b/views/create.html
@@ -4,54 +4,56 @@
     <span translate>Creating wallet...</span>
   </div>
   <div class="setup" ng-show="!loading">
+    <h1 class="hide-for-large-up">{{$root.title}}</h1>
     <form name="setupForm" ng-submit="create(setupForm)" novalidate>
-
-      <h1 class="hide-for-large-up">{{$root.title}}</h1>
-      <div class="large-12 columns panel">
-        <div class="row collapse">
-          <label><span translate>Wallet name</span>
-            <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName">
-          </label>
-          <div class="row">
-            <div class="large-6 medium-6 columns">
-              <label><span translate>Select total number of copayers (*)</span>
-                <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
-                </select>
-              </label>
-            </div>
-            <div class="large-6 medium-6 columns">
-              <label><span translate>Select required signatures (*)</span>
-                <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues" ng-disabled="totalCopayers == 1">
-                </select>
-              </label>
-            </div>
-          </div>
-          <div class="box-setup-copayers">
-            <div class="box-setup-copayers p10 oh">
-              <div class="copay-box" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}" ng-repeat="i in getNumber(totalCopayers) track by $index">
-                <span ng-include="'views/includes/photo.html'"></span>
+      <div class="row">
+        <div class="large-12 columns">
+          <div class="panel">
+            <label><span translate>Wallet name</span>
+              <input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName">
+            </label>
+            <div class="row">
+              <div class="large-6 medium-6 columns">
+                <label><span translate>Select total number of copayers (*)</span>
+                  <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
+                  </select>
+                </label>
+              </div>
+              <div class="large-6 medium-6 columns">
+                <label><span translate>Select required signatures (*)</span>
+                  <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues" ng-disabled="totalCopayers == 1">
+                  </select>
+                </label>
               </div>
             </div>
-          </div>
-          <p translate class="comment" ng-show="totalCopayers>1">(*) The limits are imposed by the bitcoin network.</p>
+            <div class="box-setup-copayers">
+              <div class="box-setup-copayers p10 oh">
+                <div class="copay-box" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}" ng-repeat="i in getNumber(totalCopayers) track by $index">
+                  <span ng-include="'views/includes/photo.html'"></span>
+                </div>
+              </div>
+            </div>
+            <p translate class="comment" ng-show="totalCopayers>1">(*) The limits are imposed by the bitcoin network.</p>
 
-          <div class="line-dashed-h"></div>
+            <div class="line-dashed-h"></div>
 
-          <div class="m20t m20b">
-            <a class="small" ng-click="hideAdv=!hideAdv">
-              <i class="fi-widget m3r"></i>
-              <span translate ng-hide="!hideAdv">Show</span> 
-              <span translate ng-hide="hideAdv">Hide</span> 
-              <span translate>advanced options</span>
-            </a>
-          </div>
-          <div ng-hide="hideAdv" class="row">
-            <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-checked="networkName == 'testnet' ? true : false">
-            <label for="network-name" translate>Use test network</label>
+            <div class="m20t m20b">
+              <a class="small" ng-click="hideAdv=!hideAdv">
+                <i class="fi-widget m3r"></i>
+                <span translate ng-hide="!hideAdv">Show</span> 
+                <span translate ng-hide="hideAdv">Hide</span> 
+                <span translate>advanced options</span>
+                <i ng-if="hideAdv" class="icon-arrow-down4"></i>
+                <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
+              </a>
+            </div>
+            <div ng-hide="hideAdv" class="row">
+              <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-checked="networkName == 'testnet' ? true : false">
+              <label for="network-name" translate>Use test network</label>
 
-            <p>
-            <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="private">
-          </div>
+              <p>
+              <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="private">
+            </div>
 
 
             <div class="text-right">
@@ -64,9 +66,10 @@
               </button>
             </div>
             <div ng-show="showNetwork()"><p translate class="size-12">Using network: {{networkName}} at <a href="{{networkUrl}}" target="_blank">{{networkUrl}}</a></p></div>
-         </div>
+          </div>
         </div>
       </div>
-    </form>
+    </div>
+  </form>
   </div>
 </div>
diff --git a/views/import.html b/views/import.html
index cd6601f54..8b3ec1f33 100644
--- a/views/import.html
+++ b/views/import.html
@@ -4,44 +4,45 @@
     {{ importStatus|translate }}
   </div>
 
-  <div class="row" ng-show="!loading">
-    <div class="large-12 columns panel">
- 
-        <h1 class="hide-for-large-up">{{$root.title}}</h1>
-        <form name="importForm" ng-submit="import(importForm)" novalidate>
+  <div ng-show="!loading">
+    <h1 class="hide-for-large-up">{{$root.title}}</h1>
+    <div class="row">
+      <div class="large-12 columns">
+        <div class="panel">
+          <form name="importForm" ng-submit="import(importForm)" novalidate>
             <div ng-show="!is_iOS && !backupOldWallet">
               <legend for="backupFile" class="m10b"> 
                 <span translate>Choose backup file from your computer</span> <i class="fi-laptop"></i>
               </legend>
               <input type="file" class="form-control" 
-                placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
+              placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
             </div>
 
             <div ng-show="is_iOS && !backupOldWallet">
-            <label for="backupText" class="m10b"> 
-              <span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
-            </label>
-            <textarea class="form-control" 
-              name="backupText" 
-              ng-model="backupText" 
-              rows="5"></textarea>
+              <label for="backupText" class="m10b"> 
+                <span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
+              </label>
+              <textarea class="form-control" 
+                name="backupText" 
+                ng-model="backupText" 
+                rows="5"></textarea>
             </div>
 
             <div ng-show="anyWallet && (!backupFile || !backupText)">
               <label for="backupOldWAllet" class="m10b size-14"> 
                 <span translate>You have old wallets in your localStorage. Choose one to import</span> <i class="fi-bitcoin"></i>
               </label>
-                <select ng-model="backupOldWallet" name="backupOldWallet"
-                  ng-options="wallet.name for wallet in oldWallets">
-                  <option value="">-- choose wallet --</option>
-                </select>
+              <select ng-model="backupOldWallet" name="backupOldWallet"
+                ng-options="wallet.name for wallet in oldWallets">
+                <option value="">-- choose wallet --</option>
+              </select>
             </div>
 
 
             <label for="password" class="m10b"><span translate>Password</span> <small translate>Required</small></label>
             <input type="password" class="form-control" 
             placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
-            
+
             <div class="line-dashed-h m10b m20t"></div>
 
             <a class="expand small"  ng-click="hideAdv=!hideAdv">
@@ -49,39 +50,43 @@
               <span translate ng-hide="!hideAdv">Show</span> 
               <span translate ng-hide="hideAdv">Hide</span> 
               <span translate>advanced options</span>
+              <i ng-if="hideAdv" class="icon-arrow-down4"></i>
+              <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
             </a>
 
             <div ng-hide="hideAdv" class="m10t">
               <label>
-              <input type="checkbox" class="form-control"
-              name="skipPublicKeyRing" ng-model="skipPublicKeyRing"> 
-              <span translate>Skip public keys from peers</span>
+                <input type="checkbox" class="form-control"
+                name="skipPublicKeyRing" ng-model="skipPublicKeyRing"> 
+                <span translate>Skip public keys from peers</span>
               </label>
 
               <label>
-              <input type="checkbox" class="form-control"
-              name="skipTxProposals" ng-model="skipTxProposals"> 
-              <span translate>Skip transaction proposals from Backup</span>
+                <input type="checkbox" class="form-control"
+                name="skipTxProposals" ng-model="skipTxProposals"> 
+                <span translate>Skip transaction proposals from Backup</span>
               </label>
             </div>
-          
 
-          <div data-alert ng-show="skipFields">
-            <i class="size-18 fi-alert"></i> 
-            <span translate>Skipping fields: {{skipFields}}</span>
-          </div>
-      
 
-          <div class="text-right m20t">
-            <a class="back-button m20r text-black" href="#!/manage">
-              <i class="icon-arrow-left2 vm"></i> 
-              <span translate>Back</span>
-            </a>
-            <button translate type="submit" class="button black m0" ng-disabled="importForm.$invalid">
-              Import backup
-            </button>
-          </div>
-        </form>
+            <div data-alert ng-show="skipFields">
+              <i class="size-18 fi-alert"></i> 
+              <span translate>Skipping fields: {{skipFields}}</span>
+            </div>
+
+
+            <div class="text-right m20t">
+              <a class="back-button m20r text-black" href="#!/manage">
+                <i class="icon-arrow-left2 vm"></i> 
+                <span translate>Back</span>
+              </a>
+              <button translate type="submit" class="button black m0" ng-disabled="importForm.$invalid">
+                Import backup
+              </button>
+            </div>
+          </form>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/views/join.html b/views/join.html
index 6f87b96dc..b2472da64 100644
--- a/views/join.html
+++ b/views/join.html
@@ -6,73 +6,76 @@
 
   <div ng-show="!loading">
     <h1 class="hide-for-large-up">{{$root.title}}</h1>
-    <div class="large-12 columns panel">
-      <div class="row collapse">
+      <div class="row">
+        <div class="large-12 columns">
         <form name="joinForm" ng-submit="join(joinForm)" novalidate>
+          <div class="panel">
+            <label for="connectionId"><span translate>Wallet Secret</span> 
+              <small translate class="has-error" ng-show="joinForm.connectionId.$invalid
+                && !joinForm.connectionId.$pristine">Wallet Secret is not valid!</small>
+              <small translate data-options="disable_for_touch:true" ng-show="joinForm.connectionId.$pristine" class="has-tip
+                text-gray" tooltip="Paste wallet secret here">Required</small>
+            </label>
 
-          <label for="connectionId"><span translate>Wallet Secret</span> 
-            <small translate class="has-error" ng-show="joinForm.connectionId.$invalid
-              && !joinForm.connectionId.$pristine">Wallet Secret is not valid!</small>
-            <small translate data-options="disable_for_touch:true" ng-show="joinForm.connectionId.$pristine" class="has-tip
-              text-gray" tooltip="Paste wallet secret here">Required</small>
-          </label>
+            <div class="row collapse">
+              <div class="large-10 medium-10 small-10 columns pr">
+                <input id="connectionId" type="text" class="small-9 columns" 
+                placeholder="{{'Paste wallet secret here'|translate}}" 
+                name="connectionId" ng-model="connectionId" wallet-secret required>
+                <small class="icon-input" ng-show="joinForm.connectionId.$invalid && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
+                <small class="icon-input" ng-show="joinForm.connectionId.$valid
+                  && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
+              </div>
+              <div class="small-2 columns" ng-hide="showScanner || disableScanner">
+                <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
+              </div>
+              <div class="small-2 columns" ng-show="showScanner">
+                <a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
+              </div>
+            </div>
 
-          <div class="row collapse">
-            <div class="large-10 medium-10 small-10 columns pr">
-              <input id="connectionId" type="text" class="small-9 columns" 
-              placeholder="{{'Paste wallet secret here'|translate}}" 
-              name="connectionId" ng-model="connectionId" wallet-secret required>
-              <small class="icon-input" ng-show="joinForm.connectionId.$invalid && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
-              <small class="icon-input" ng-show="joinForm.connectionId.$valid
-                && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
-            </div>
-            <div class="small-2 columns" ng-hide="showScanner || disableScanner">
-              <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
-            </div>
-            <div class="small-2 columns" ng-show="showScanner">
-              <a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
-            </div>
-          </div>
-
-          <div id="scanner" class="row" ng-if="showScanner">
-            <div class="text-centered">
-              <canvas id="qr-canvas" width="200" height="150"></canvas>
-              <div ng-show="isMobile">
-                <div id="file-input-wrapper" class="btn btn-primary">
-                  <span class="pull-left text-centered">
-                    <i class="glyphicon glyphicon-refresh icon-rotate"></i>
-                    <span translate>Get QR code</span>
-                  </span>
-                  <input id="qrcode-camera" type="file" capture="camera" accept="image/*">
+            <div id="scanner" class="row" ng-if="showScanner">
+              <div class="text-centered">
+                <canvas id="qr-canvas" width="200" height="150"></canvas>
+                <div ng-show="isMobile">
+                  <div id="file-input-wrapper" class="btn btn-primary">
+                    <span class="pull-left text-centered">
+                      <i class="glyphicon glyphicon-refresh icon-rotate"></i>
+                      <span translate>Get QR code</span>
+                    </span>
+                    <input id="qrcode-camera" type="file" capture="camera" accept="image/*">
+                  </div>
+                </div>
+                <div ng-hide="isMobile">
+                  <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
                 </div>
               </div>
-              <div ng-hide="isMobile">
-                <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
-              </div>
             </div>
-          </div>
 
-          <div class="line-dashed-h"></div>
+            <div class="line-dashed-h"></div>
 
-          <div class="m20t m20b">
-            <a class="expand small" ng-click="hideAdv=!hideAdv">
-              <i class="fi-widget m3r"></i>
-              <span translate ng-hide="!hideAdv">Show</span> 
-              <span translate ng-hide="hideAdv">Hide</span> 
-              <span translate>advanced options</span>
-            </a>
-          </div>
-          <div ng-hide="hideAdv">
-            <p>
-            <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private">
-          </div>
+            <div class="m20t m20b">
+              <a class="expand small" ng-click="hideAdv=!hideAdv">
+                <i class="fi-widget m3r"></i>
+                <span translate ng-hide="!hideAdv">Show</span> 
+                <span translate ng-hide="hideAdv">Hide</span> 
+                <span translate>advanced options</span>
+                <i ng-if="hideAdv" class="icon-arrow-down4"></i>
+                <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
+              </a>
+            </div>
+            <div ng-hide="hideAdv">
+              <p>
+              <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private">
+            </div>
 
-          <div class="text-right">
-            <a class="back-button m20r" href="#!/manage">
-              <i class="icon-arrow-left2 vm"></i> 
-              <span translate>Back</span>
-            </a>
-            <button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button>
+            <div class="text-right">
+              <a class="back-button m20r" href="#!/manage">
+                <i class="icon-arrow-left2 vm"></i> 
+                <span translate>Back</span>
+              </a>
+              <button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button>
+            </div>
           </div>
         </form>
       </div>