diff --git a/css/src/main.css b/css/src/main.css
index fbb8e1211..cb5eef542 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -1181,7 +1181,7 @@ button.gray:focus,
   width: 38px;
   height: 28px;
   right: 7px;
-  top: 29px;
+  top: 28px;
   -moz-box-shadow: none;
   box-shadow: none;
   line-height: 1.7rem;
diff --git a/views/createProfile.html b/views/createProfile.html
index acef90c98..bb1aa7816 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -50,7 +50,7 @@
           <span class="icon-input right" ng-show="profileForm.repeatpassword.$dirty &&
             !profileForm.repeatpassword.$invalid"><i class="fi-check"></i></span>
           <input type="password" ng-model="repeatpassword"
-          class="form-control" name="repeatpassword" 
+          class="columns form-control" name="repeatpassword" 
           placeholder="{{'Repeat password'|translate}}"
           match="password" required >  
         </div>
diff --git a/views/import.html b/views/import.html
index d604661c3..6c84dfb47 100644
--- a/views/import.html
+++ b/views/import.html
@@ -38,7 +38,7 @@
             </div>
 
 
-            <label for="password" class="m10b"><span translate>Password</span>  <small translate>Required</small>
+            <label for="password"><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>
 
diff --git a/views/join.html b/views/join.html
index 00c306692..c1bf473c2 100644
--- a/views/join.html
+++ b/views/join.html
@@ -10,51 +10,52 @@
         <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>
-
             <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>
+              <label for="connectionId" class="left"><span translate>Wallet Secret</span> 
+                <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>
+              <span translate class="has-error right size-12" ng-show="joinForm.connectionId.$invalid
+                  && !joinForm.connectionId.$pristine">
+                <span class="icon-input"><i class="fi-x"></i></span>
+                Wallet Secret is not valid!
+              </span>
+              <small class="icon-input right" ng-show="joinForm.connectionId.$valid
+                    && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
 
-            <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 class="pr">
+                <input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
+                <div ng-hide="showScanner || disableScanner">
+                  <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
                 </div>
-                <div ng-hide="isMobile">
-                  <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
+                <div 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>
+                  </div>
+                  <div ng-hide="isMobile">
+                    <video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
+                  </div>
                 </div>
               </div>
             </div>
 
             <div class="line-dashed-h"></div>
 
-            <div class="m20t m20b">
+            <div class="m20t m20b left">
               <a class="expand small" ng-click="hideAdv=!hideAdv">
                 <i class="fi-widget m3r"></i>
                 <span translate ng-hide="!hideAdv">Show</span> 
@@ -69,7 +70,7 @@
               <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private">
             </div>
 
-            <div class="text-right">
+            <div class="text-right m20t">
               <button translate type="submit" class="button secondary m0" ng-disabled="joinForm.$invalid">Join</button>
             </div>
           </div>
diff --git a/views/send.html b/views/send.html
index e17f8a0a9..23cfe97d2 100644
--- a/views/send.html
+++ b/views/send.html
@@ -40,7 +40,7 @@
               <small class="icon-input right" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
 
               <div class="pr">
-                <input type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant"
+                <input class="columns" type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant"
                 placeholder="{{'Bitcoin address'|translate}}" ng-model="address" ng-change="onChanged()" valid-address required>
                 <div ng-hide="showScanner || disableScanner">
                   <button class="postfix button black" ng-click="openScanner()"><i class="fi-camera size-24"></i></button>
@@ -49,6 +49,7 @@
                   <button translate class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i></button>
                 </div>
               </div>
+
             </div>
             <div id="scanner" ng-if="showScanner">
               <div class="text-centered">