diff --git a/Gruntfile.js b/Gruntfile.js
index c813ca3e0..468e3671e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -169,7 +169,7 @@ module.exports = function(grunt) {
       },
       vendors: {
         files: {
-          'css/vendors.min.css': ['css/foundation.min.css', 'css/foundation-icons.css', 'lib/angular/angular-csp.css']
+          'css/vendors.min.css': ['css/foundation.min.css', 'css/foundation-icons.css']
         }
       }
     },
diff --git a/css/src/mobile.css b/css/src/mobile.css
index d695d2d35..24458a1ea 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -4,7 +4,7 @@
  *
  */
 
-@media (max-width: 1024px) {
+@media (max-width: 1024px) { 
 
   .loading-screen {
     background-color: #2C3E50;
@@ -228,7 +228,11 @@
 
   .side-nav li.nav-item.selected {
     background-color: #3C4E60;
-  }
+  } 
+
+  /* 
+   * Remove all vendors hover / shadow / fade 
+   */
 
   .tooltip {
     display: none !important;
@@ -239,8 +243,6 @@
     box-shadow: none;
   }
 
-  /* Remove all vendors hover */
-
   ul.off-canvas-list li a:hover {
     background: none;
   }
@@ -249,6 +251,30 @@
     padding: 0;
   }
 
+  a, button, .button, input, textarea, select {
+    -webkit-box-shadow: none !important;
+    -moz-box-shadow: none !important;
+    box-shadow: none !important;
+    -webkit-tap-highlight-color:rgba(0,0,0,0);
+  }
+
+  .modal.fade, .reveal-modal-bg {
+    opacity: 1;
+  }
+
+  .modal.fade .modal-dialog, .modal.in .modal-dialog, .reveal-modal-bg {
+    -webkit-transform: translate(0, 0);
+    -ms-transform: translate(0, 0);
+    transform: translate(0, 0);
+  }
+
+  .button.secondary:hover, button.secondary:hover {
+    background: #008CC1;
+    color: #fff;
+  }
+
+  /*******************************************/
+
 }
 
 @media (max-width: 640px) {
diff --git a/index.html b/index.html
index 0ac3c11c1..dfd71f286 100644
--- a/index.html
+++ b/index.html
@@ -14,8 +14,14 @@
       padding-top: 20%;
       text-align: center;
     }
-    [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-      display: none;
+    [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
+    .ng-cloak, .x-ng-cloak,
+    .ng-hide:not(.ng-hide-animate) {
+      display: none !important;
+    }
+
+    ng\:form {
+      display: block;
     }
   </style>
   <link rel="shortcut icon" href="img/favicon.ico">
diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index 8e6719c8e..4e211ecb7 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService, pinService, isMobile, configService, go) {
+angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, $window, notification, pluginManager, identityService, pinService, isMobile, configService, go) {
 
   var _credentials, _firstpin;
 
@@ -45,6 +45,9 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
     preconditions.checkState(_credentials && _credentials.email);
     $rootScope.starting = true;
 
+    // hide Keyboard after submit form
+    $window.document.querySelector('#repeatpin').blur();
+
     $timeout(function() {
       pinService.save(pin, _credentials.email, _credentials.password, function(err) {
         _credentials.password = '';
diff --git a/js/controllers/home.js b/js/controllers/home.js
index ae40397e0..39613cb67 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $timeout, go, notification, identityService, Compatibility, pinService, applicationService, isMobile) {
+angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $timeout, $window, go, notification, identityService, Compatibility, pinService, applicationService, isMobile) {
 
   var _credentials, _firstpin;
   $scope.init = function() {
@@ -63,6 +63,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     }
     $rootScope.starting = true;
 
+    // hide Keyboard after submit form
+    $window.document.querySelector('#pin').blur();
+
     $timeout(function() {
       var credentials = pinService.get(pin, function(err, credentials) {
         if (err || !credentials) {
@@ -89,6 +92,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     preconditions.checkState(_credentials && _credentials.email);
     $rootScope.starting = true;
 
+    // hide Keyboard after submit form
+    $window.document.querySelector('#repeatpin').blur();
+
     $timeout(function() {
       pinService.save(pin, _credentials.email, _credentials.password, function(err) {
         _credentials.password = '';