diff --git a/web/app/assets/javascripts/gear/step_network_test.js b/web/app/assets/javascripts/gear/step_network_test.js
index 34f6710ee..edb5e8cb6 100644
--- a/web/app/assets/javascripts/gear/step_network_test.js
+++ b/web/app/assets/javascripts/gear/step_network_test.js
@@ -185,7 +185,7 @@
 
       updateProgress(0, false);
 
-      backendGuardTimeout = setTimeout(function(){backendTimedOut()}, gon.ftue_network_test_duration + 1000);
+      backendGuardTimeout = setTimeout(function(){backendTimedOut()}, (gon.ftue_network_test_duration + 1) * 1000);
 
       context.jamClient.TestNetworkPktBwRate(serverClientId, TEST_SUCCESS_CALLBACK, TEST_TIMEOUT_CALLBACK,
         NETWORK_TEST_TYPES.PktTest400LowLatency,
@@ -452,7 +452,7 @@
     }
 
     this.newSession = newSession;
-    this.afterHide = afterHide;
+    this.beforeHide = beforeHide;
     this.beforeShow = beforeShow;
     this.initialize = initialize;
 
diff --git a/web/app/assets/javascripts/gear/step_select_gear.js b/web/app/assets/javascripts/gear/step_select_gear.js
index 9f1afd38c..5b4a5f59b 100644
--- a/web/app/assets/javascripts/gear/step_select_gear.js
+++ b/web/app/assets/javascripts/gear/step_select_gear.js
@@ -1038,7 +1038,7 @@
       }
     }
 
-    function beforeShow() {
+    function newSession() {
       deviceInformation = context.JK.loadDeviceInfo();
       resetState();
       initializeFormElements();
@@ -1047,19 +1047,23 @@
       initializeASIOButtons();
       initializeKnobs();
       initializeResync();
+    }
+
+    function beforeShow() {
       $(window).on('focus', onFocus);
     }
 
+    function beforeHide() {
+      logger.debug("unregistering focus watch")
+      $(window).off('focus', onFocus);
+    }
+
     function resetState() {
       invalidateScore();
       clearInputPorts();
       clearOutputPorts();
       resetFrameBuffers();
     }
-    function afterHide() {
-      logger.debug("unregistering focus watch")
-      $(window).off('focus', onFocus);
-    }
 
     function initialize(_$step) {
       $step = _$step;
@@ -1098,8 +1102,9 @@
     }
 
     this.handleNext = handleNext;
+    this.newSession = newSession;
     this.beforeShow = beforeShow;
-    this.afterHide = afterHide;
+    this.beforeHide = beforeHide;
     this.initialize = initialize;
 
     self = this;
diff --git a/web/vendor/assets/javascripts/jquery.icheck.js b/web/vendor/assets/javascripts/jquery.icheck.js
index 4e0cffeb9..ab4eed092 100644
--- a/web/vendor/assets/javascripts/jquery.icheck.js
+++ b/web/vendor/assets/javascripts/jquery.icheck.js
@@ -285,12 +285,10 @@
 
         // Check, disable or indeterminate
         if (/^(ch|di|in)/.test(method) && !active) {
-          console.log("TAKING ROUTE: ", state);
             on(input, state);
 
             // Uncheck, enable or determinate
         } else if (/^(un|en|de)/.test(method) && active) {
-          console.log("TAKING ROUTE2: ", state);
             off(input, state);
 
             // Update