diff --git a/src/js/controllers/lockSetup.js b/src/js/controllers/lockSetup.js
index fc4470bcc..cb6ff03cd 100644
--- a/src/js/controllers/lockSetup.js
+++ b/src/js/controllers/lockSetup.js
@@ -121,7 +121,6 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
     switch (method) {
       case 'pin':
         applicationService.pinModal('disable');
-        initMethodSelector();
         break;
       case 'fingerprint':
         fingerprintService.check('unlockingApp', function(err) {
@@ -136,7 +135,6 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
     switch (method) {
       case 'pin':
         applicationService.pinModal('setup');
-        initMethodSelector();
         break;
       case 'fingerprint':
         saveConfig('fingerprint');
@@ -159,7 +157,7 @@ angular.module('copayApp.controllers').controller('lockSetupController', functio
   };
 
   $rootScope.$on('pinModalClosed', function() {
-    initMethodSelector();
+    init()
   });
 
 });
diff --git a/src/js/controllers/modals/pin.js b/src/js/controllers/modals/pin.js
index 1e2acfb2b..ec1623234 100644
--- a/src/js/controllers/modals/pin.js
+++ b/src/js/controllers/modals/pin.js
@@ -204,4 +204,5 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
       lockTimeControl(bannedUntil);
     });
   };
+
 });
diff --git a/src/js/controllers/modals/pintest.js b/src/js/controllers/modals/pintest.js
deleted file mode 100644
index 2ab63e625..000000000
--- a/src/js/controllers/modals/pintest.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-angular.module('copayApp.controllers').controller('pinTestController', function($scope, applicationService) {
-
-  $scope.goodPin = function() {
-    applicationService.successfullUnlocked = true;
-    $scope.pintestview.hide();
-  };
-
-  $scope.badPin = function() {};
-
-});
diff --git a/src/js/routes.js b/src/js/routes.js
index 5394d9ff3..f0781c0a9 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -1227,13 +1227,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
               disableAnimate: true,
               historyRoot: true
             });
-            $state.transitionTo('tabs.home');
+            $state.transitionTo('tabs.home').then(function() {
+              // Clear history
+              $ionicHistory.clearHistory();
+            });
           });
         };
         // After everything have been loaded, initialize handler URL
         $timeout(function() {
           openURLService.init();
-        });
+        }, 1000);
       });
     });
 
diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js
index 3c8f26dab..ad62d3ef4 100644
--- a/src/js/services/glideraService.js
+++ b/src/js/services/glideraService.js
@@ -17,7 +17,7 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
      * Development: 'testnet'
      * Production: 'livenet'
      */
-    credentials.NETWORK = 'testnet';
+    credentials.NETWORK = 'livenet';
     //credentials.NETWORK = 'testnet';
 
     if (credentials.NETWORK == 'testnet') {
diff --git a/www/views/modals/pin.html b/www/views/modals/pin.html
index df0e82534..7d852b1b9 100644
--- a/www/views/modals/pin.html
+++ b/www/views/modals/pin.html
@@ -1,4 +1,9 @@
 <ion-modal-view id="pin" ng-controller="pinController">
+  <ion-header-bar align-title="center" class="bar-royal">
+    <button ng-if="action != 'check'" class="button button-back button-clear" ng-click="hideModal()">
+      Close
+    </button>
+  </ion-header-bar>
   <div class="content">
     <div class="block-text row">
       <div class="message" ng-if="!confirmPin && !error" translate>Please enter your PIN</div>
diff --git a/www/views/modals/pintestview.html b/www/views/modals/pintestview.html
deleted file mode 100644
index 0f1f6afe4..000000000
--- a/www/views/modals/pintestview.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<ion-modal-view ng-controller="pinTestController">
-  <ion-content>
-    <button class="button button-positive" ng-click="goodPin()">
-      BIEN PUESTO
-    </button>
-    <button class="button button-positive" ng-click="badPin()">
-      MAL PUESTO
-    </button>
-  </ion-content>
-</ion-modal-view>
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index cfc054614..a26061508 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -89,7 +89,7 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
-      <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova || isDevel">
+      <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lockSetup" ng-if="isCordova">
         <i class="icon ion-ios-locked-outline" ng-if="locked"></i>
         <i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
         <span class="setting-title">{{'Lock App' | translate}}</span>