diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a05dad2e8..4b100b665 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -1,4 +1,21 @@
 <div ng-controller="walletHomeController as home">
+
+  <div class="onGoingProcess" ng-show="index.anyOnGoingProcess" ng-style="{'background-color':index.backgroundColor}">
+    <div class="spinner">
+      <div class="rect1"></div>
+      <div class="rect2"></div>
+      <div class="rect3"></div>
+      <div class="rect4"></div>
+      <div class="rect5"></div>
+    </div>
+    <span translate ng-show="index.onGoingProcessName == 'openingWallet'"> Updating Wallet... </span>
+    <span translate ng-show="index.onGoingProcessName == 'updatingStatus'"> Updating Status...</span>
+    <span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Wallet... </span>
+    <span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Wallet...</span>
+    <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
+    <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet...</span>
+  </div>
+
   <div id="walletHome" class="walletHome tab-view tab-in">
     <div class="oh" ng-show="!index.noFocusedWallet">
       <div class="amount" ng-style="{'background-color':index.backgroundColor}">
@@ -48,23 +65,7 @@
           </div>
         </div>
       </div>
-    </div>
-
-    <div class="onGoingProcess" ng-show="index.anyOnGoingProcess" ng-style="{'background-color':index.backgroundColor}">
-      <div class="spinner">
-        <div class="rect1"></div>
-        <div class="rect2"></div>
-        <div class="rect3"></div>
-        <div class="rect4"></div>
-        <div class="rect5"></div>
-      </div>
-      <span translate ng-show="index.onGoingProcessName == 'openingWallet'"> Updating Wallet... </span>
-      <span translate ng-show="index.onGoingProcessName == 'updatingStatus'"> Updating Status...</span>
-      <span translate ng-show="index.onGoingProcessName == 'updatingBalance'">Updating Wallet... </span>
-      <span translate ng-show="index.onGoingProcessName == 'updatingPendingTxps'">Updating Wallet...</span>
-      <span translate ng-show="index.onGoingProcessName == 'scanning'">Scanning Wallet funds...</span>
-      <span translate ng-show="index.onGoingProcessName == 'recreating'">Recreating Wallet...</span>
-    </div>
+    </div> 
 
     <div class="m20t" ng-show="index.notAuthorized">
       <div class="text-center text-warning">
diff --git a/src/css/main.css b/src/css/main.css
index d41667a74..0ce815506 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -123,8 +123,6 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
 
 .page, .main {
   height:100%;
-  overflow-y: auto;
-  overflow-x: none;
   background-color: #fff;
 }
 
@@ -1123,6 +1121,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   font-size: 13px;
   position: absolute;
   opacity: 0.8;
+  z-index: 10;
 }
 
 
diff --git a/src/css/mobile.css b/src/css/mobile.css
index a516f3642..3bffe52c9 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -686,9 +686,10 @@ a.pin-button:active {
   -webkit-transform: translate3d(-100%, 0, 0);
   transform: translate3d(-100%, 0, 0);
   width:100%;
-  position: absolute;
-  margin-bottom: 50px;
-  height: 100%;
+  position: absolute; 
+  top: 46px;
+  bottom: 80px;
+  overflow: auto;
 }
 
 .tab-in {