diff --git a/components/wifi-manager/code.js b/components/wifi-manager/code.js
index 098a02f0..447834b4 100644
--- a/components/wifi-manager/code.js
+++ b/components/wifi-manager/code.js
@@ -188,6 +188,14 @@ $(document).ready(function(){
             data: { 'timestamp': Date.now() }
         });
         console.log('sent config JSON with headers:', autoexec);
+        console.log('now triggering reboot');
+        $.ajax({
+            url: '/reboot.json',
+            dataType: 'json',
+            method: 'POST',
+            cache: false,
+            data: { 'timestamp': Date.now()}
+        });
     });
 
 	$("#save-autoexec1").on("click", function() {
@@ -265,7 +273,6 @@ $(document).ready(function(){
                 });
                 var [ver, idf, cfg, branch] = release.name.split('#');
                 var body = release.body.replace(/\\n/ig, "<br />").replace(/\'/ig, "\"");
-                console.log(body);
                 $("#releaseTable").append(
                     "<tr>"+
                       "<td data-toggle='tooltip' title='"+body+"'>"+ver+"</td>"+
@@ -289,6 +296,7 @@ $(document).ready(function(){
     //start timers
 	startCheckStatusInterval();
 	startRefreshAPInterval();
+
     $('[data-toggle="tooltip"]').tooltip({
         html: true,
         placement : 'right',
diff --git a/components/wifi-manager/index.html b/components/wifi-manager/index.html
index d2896b99..18ab0b72 100644
--- a/components/wifi-manager/index.html
+++ b/components/wifi-manager/index.html
@@ -28,9 +28,6 @@
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="tab" href="#tab-wifi">WiFi</a>
             </li>
-            <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#tab-startup">Startup</a>
-            </li>
             <li class="nav-item">
                 <a class="nav-link" data-toggle="tab" href="#tab-audio">Audio + LMS</a>
             </li>
@@ -148,15 +145,6 @@
                 </div>
             </div>
 
-            <div class="tab-pane fade" id="tab-startup">
-                <h1>Run squeezelite automatically at boot</h1>
-
-                <div class="custom-control custom-switch">
-                      <input type="checkbox" class="custom-control-input" id="autoexec-cb" checked="checked">
-                      <label class="custom-control-label" for="autoexec-cb"></label>
-                </div>
-            </div>
-
             <div class="tab-pane fade" id="tab-audio">
                 <div id="audioout">
                     <h1>Audio output</h1>
@@ -198,6 +186,13 @@
                 <div class="buttons">
                     <input id="save-autoexec1" type="button" class="btn btn-success" value="Save" />
                 </div>
+
+                <h1>Start Squeezelite</h1>
+                <div class="custom-control custom-switch">
+                      <input type="checkbox" class="custom-control-input" id="autoexec-cb" checked="checked">
+                      <label class="custom-control-label" for="autoexec-cb"></label>
+                </div>
+                <br />
             </div>
 
             <div class="tab-pane fade" id="tab-gpio">
@@ -207,7 +202,7 @@
                 <div id="recoverydiv">
                     <h1>Check for firmware upgrade</h1>
                     <div class="buttons">
-                        <input type="button" id="fwcheck" class="btn btn-info" value="Update" />
+                        <input type="button" id="fwcheck" class="btn btn-info" value="Check for updates" />
                     </div>
                     <table class="table table-hover">
                         <thead>
diff --git a/components/wifi-manager/style.css b/components/wifi-manager/style.css
index 41280d2b..00ce8ccc 100644
--- a/components/wifi-manager/style.css
+++ b/components/wifi-manager/style.css
@@ -233,6 +233,7 @@ input[type='text'], input[type='password'], textarea {
   width: 3.5rem;
   pointer-events: all;
   border-radius: 1rem;
+  background-color: #f00;
 }
 
 .custom-switch .custom-control-label::after {
@@ -252,6 +253,10 @@ input[type='text'], input[type='password'], textarea {
   }
 }
 
+.custom-switch .custom-control-input:checked ~ .custom-control-label::before {
+  background-color: #0f0;
+}
+
 .custom-switch .custom-control-input:checked ~ .custom-control-label::after {
   background-color: #fff;
   -webkit-transform: translateX(1.5rem); //translateX(0.75rem);