diff --git a/www/js/app.js b/www/js/app.js
index 52522e22..e3d16181 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -58,35 +58,44 @@ function browser_is(bname) {
 
 window.onload = () => {
 	//to check if javascript is disabled like in android preview
-	displayNone('loadingmsg');
-	console.log('Connect to board');
+	displayNone("loadingmsg");
+	console.log("Connect to board");
 
-	let connectLoaded = false;
-	let controlsLoaded = false;
-	let navbarLoaded = false;
+	// These are all falsey, indicating nothing has been loaded
+	let connectDlg = "";
+	let controlsPanel = "";
+	let navbarLoaded = "";
+
+	let failSafe = 10;
 
 	let startUpInt = setInterval(() => {
 		// Check for various key HTML panels and load them up
-		if (!connectLoaded && id("connectdlg.html")) {
+		if (!connectDlg && id("connectdlg.html")) {
+			connectDlg = "loading";
 			connectdlg();
-			connectLoaded = true;
+			connectDlg = "loaded";
 		}
 
-		if (!controlsLoaded && id("controlspanel.html")) {
+		if (!controlsPanel && id("controlPanel")) {
+			controlsPanel = "loading";
 			ControlsPanel();
-			controlsLoaded = true;
+			controlsPanel = "loaded";
 		}
 
 		if (!navbarLoaded && id("navbar")) {
+			navbarLoaded = "loading";
 			navbar();
 			tabletInit();
-			navbarLoaded = true;
+			navbarLoaded = "loaded";
 		}
 
-		if (connectLoaded && controlsLoaded && navbarLoaded) {
+		if ((connectDlg && controlsPanel && navbarLoaded) || failSafe <= 0) {
 			clearInterval(startUpInt);
 			startUpInt = null;
 		}
+
+		// Ensure that we always break out of this
+		failSafe--;
 	}, 500);
 }
 
@@ -195,7 +204,9 @@ function Set_page_title(page_title) {
 
 function initUI() {
 	console.log('Init UI');
-	if (ESP3D_authentication) connectdlg(false);
+	if (ESP3D_authentication) {
+		connectdlg(false);
+	}
 	AddCmd(display_boot_progress);
 	//initial check
 	if (typeof target_firmware === 'undefined' || typeof web_ui_version === 'undefined' || typeof direct_sd === 'undefined')
@@ -238,7 +249,7 @@ function initUI_3() {
 	console.log('Get macros');
 	init_controls_panel();
 	init_grbl_panel();
-	console.log('Get preferences')
+	console.log('Get preferences');
 	getpreferenceslist();
 	initUI_4();
 }
@@ -265,7 +276,7 @@ function initUI_4() {
 }
 
 function show_main_UI() {
-	displayUndoNone('main_ui')
+	displayUndoNone('main_ui');
 }
 
 // var socket_response = ''
diff --git a/www/js/config.js b/www/js/config.js
index 85b35b1d..b745adb0 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -226,10 +226,7 @@ function get_config_value(sline) {
     return tline2.length > 1 ? tline2[1] : "???";
 }
 
-function get_config_help(sline) {
-    if (is_override_config) return "";
-    return inline_help(get_config_label(sline))
-}
+const get_config_help = (sline) => (is_override_config) ? "" : inline_help(get_config_label(sline));
 
 function get_config_command(sline) {
     return get_config_label(sline) + "=";
@@ -237,9 +234,8 @@ function get_config_command(sline) {
 
 function is_config_commented(sline) {
     var line = sline.trim();
-    if (line.length == 0) return false;
-    if (is_override_config) return line.startsWith(";");
-    return false;
+    if (!line.length) return false;
+    return (is_override_config) ? line.startsWith(";") : false;
 }
 
 function config_revert_to_default(index, is_override) {
diff --git a/www/js/controls.js b/www/js/controls.js
index e94ee8a4..2d1c5ab3 100644
--- a/www/js/controls.js
+++ b/www/js/controls.js
@@ -212,14 +212,13 @@ function SendJogcommand(cmd, feedrate) {
 		return;
 	}
 
-	const controlName = axis.startsWith("Z") ? "controlpanel_z_feedrate" : "controlpanel_xy_feedrate";
-	const prefName = axis.startsWith("Z") ? "z_feedrate" : "xy_feedrate";
-	const valueDef = buildFeedRateValueDef(axis);
+	const controlName = feedrate.startsWith("Z") ? "controlpanel_z_feedrate" : "controlpanel_xy_feedrate";
+	const prefName = feedrate.startsWith("Z") ? "z_feedrate" : "xy_feedrate";
+	const valueDef = buildFeedRateValueDef(feedrate);
 
 	let letter = "Z";
-	const common = new Common();
 	let cmd = "";
-	if (common.grblaxis > 3) {
+	if (grblaxis > 3) {
 		letter = "Axis";
 		valueDef.label = valueDef.label.replace("Z axis", letter);
 		cmd = cmd.replace("Z", id("control_select_axis").value);
@@ -279,7 +278,7 @@ function control_build_macro_ui() {
 
 	var content = "<div class='tooltip'>";
 	content += "<span class='tooltip-text'>Manage macros</span>"
-	content += "<button class='btn btn-primary' onclick='showmacrodlg(processMacroSave)'>";
+	content += "<button id='control_btn_show_macro_dlg' class='btn btn-primary' onclick='showmacrodlg(processMacroSave)'>";
 	actions.push({ id: "control_btn_show_macro_dlg", type: "click", method: showmacrodlg(processMacroSave) });
 	content += "<span class='badge'>";
 	content += "<svg width='1.3em' height='1.2em' viewBox='0 0 1300 1200'>";
diff --git a/www/js/grblpanel.js b/www/js/grblpanel.js
index 252ece0c..65b1fe1b 100644
--- a/www/js/grblpanel.js
+++ b/www/js/grblpanel.js
@@ -30,8 +30,8 @@ const grblpanel = () => {
     id("grblpanel_flood").addEventListener("click", (event) => SendRealtimeCmd(0xa0));
     id("grblpanel_mist").addEventListener("click", (event) => SendRealtimeCmd(0xa1));
 
-    id("grblspindle_fwd").addEventListener("click", (event) => SendPrinterCommand(`M3 S${common.spindleTabSpindleSpeed}`, false, null, null, 1, 1,));
-    id("grblspindle_rew").addEventListener("click", (event) => SendPrinterCommand(`M4 S${common.spindleTabSpindleSpeed}`, false, null, null, 1, 1,));
+    id("grblspindle_fwd").addEventListener("click", (event) => SendPrinterCommand(`M3 S${spindleTabSpindleSpeed}`, false, null, null, 1, 1,));
+    id("grblspindle_rew").addEventListener("click", (event) => SendPrinterCommand(`M4 S${spindleTabSpindleSpeed}`, false, null, null, 1, 1,));
     id("grblspindle_off").addEventListener("click", (event) => SendPrinterCommand("M5 S0", false, null, null, 1, 1));
     id("grblspindle_rpm").addEventListener("change", (event) => setSpindleSpeed(event.value));
     id("grblspindle_rpm").addEventListener("keyup", (event) => setSpindleSpeed(event.value));
diff --git a/www/js/http.js b/www/js/http.js
index a982839c..410bb898 100644
--- a/www/js/http.js
+++ b/www/js/http.js
@@ -80,8 +80,7 @@ function AddCmd(cmd_fn, id) {
         http_errorfn(999, translate_text_item("Server not responding"));
         return;
     }
-    var cmd_id = 0;
-    if (typeof id != 'undefined') cmd_id = id;
+    const cmd_id = (typeof id !== 'undefined') ? id : 0;
     //console.log("adding command");
     var cmd = {
         cmd: cmd_fn,
diff --git a/www/sub/controlspanel.html b/www/sub/controlspanel.html
index 5d589dea..643176af 100644
--- a/www/sub/controlspanel.html
+++ b/www/sub/controlspanel.html
@@ -12,8 +12,7 @@
                                 <td>&nbsp;&nbsp;</td>
                                 <td>
                                     <label>
-                                        <input type="checkbox" id="autocheck_position"
-                                            onclick="on_autocheck_position()" />
+                                        <input id="autocheck_position" type="checkbox"/>
                                         <span translate>auto-check position every:</span>
                                     </label>
                                 </td>
@@ -22,8 +21,8 @@
                         <table class="input-group">
                             <tr>
                                 <td>
-                                    <input id="controlpanel_interval_positions" class="form-control w4" type="number" min="1" max="99"
-                                        onchange="onPosIntervalChange()" />
+                                    <input id="controlpanel_interval_positions" class="form-control w4" type="number"
+                                        min="1" max="99"/>
                                     <span class="input-group-addon form_control" translate>sec</span>
                                 </td>
                             </tr>
@@ -47,22 +46,20 @@
             </div>
         </div>
         <div>
-            <button class="btn btn-xs btn-default" id="zero_xyz_btn"
-                onclick="SendZerocommand(grblzerocmd)">&Oslash;<span style="font-size:8px;"
-                    id="zero_xyz_btn_txt">XYZ</span></button>
+            <button id="zero_xyz_btn" class="btn btn-xs btn-default">&Oslash;<span id="zero_xyz_btn_txt" style="font-size:8px;">XYZ</span>
+            </button>
         </div><br>
-        <div class="position-container" id="positions_labels">
+        <div id="positions_labels" class="position-container">
             <div class="position_text">
                 <table>
                     <tr>
                         <td>
-                            <button class="btn btn-xs btn-default" id="zero_x_btn"
-                                onclick="SendZerocommand('X0')">&Oslash;</button>
+                            <button id="zero_x_btn" class="btn btn-xs btn-default">&Oslash;</button>
                         </td>
                         <td>
-                            <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                    id="control_x_position_label">X</span>:<span
-                                    id="control_x_position">&nbsp;</span></span>
+                            <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                <span id="control_x_position_label">X</span>:<span id="control_x_position">&nbsp;</span>
+                            </span>
                         </td>
                         <td>
                         </td>
@@ -75,9 +72,10 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                                id="control_xm_position_label">Xm</span>:<span
-                                                id="control_xm_position">&nbsp;</span></span>
+                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                            <span id="control_xm_position_label">Xm</span>:<span
+                                                id="control_xm_position">&nbsp;</span>
+                                        </span>
                                     </td>
                                 </tr>
                             </table>
@@ -89,13 +87,12 @@
                 <table>
                     <tr>
                         <td>
-                            <button class="btn btn-xs btn-default" id="zero_y_btn"
-                                onclick="SendZerocommand('Y0')">&Oslash;</button>
+                            <button id="zero_y_btn" class="btn btn-xs btn-default">&Oslash;</button>
                         </td>
                         <td>
-                            <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                    id="control_y_position_label">Y</span>:<span
-                                    id="control_y_position">&nbsp;</span></span>
+                            <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                <span id="control_y_position_label">Y</span>:<span id="control_y_position">&nbsp;</span>
+                            </span>
                         </td>
                         <td>
                         </td>
@@ -108,9 +105,10 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                                id="control_yt_position_label">Ym</span>:<span
-                                                id="control_ym_position">&nbsp;</span></span>
+                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                            <span id="control_yt_position_label">Ym</span>:<span
+                                                id="control_ym_position">&nbsp;</span>
+                                        </span>
                                     </td>
                                 </tr>
                             </table>
@@ -118,12 +116,11 @@
                     </tr>
                 </table>
             </div>
-            <div class="position_text" id="control_z_position_display">
+            <div id="control_z_position_display" class="position_text">
                 <table>
                     <tr>
                         <td>
-                            <button class="btn btn-xs btn-default" id="zero_z_btn"
-                                onclick="SendZerocommand('Z0')">&Oslash;</button>
+                            <button id="zero_z_btn" class="btn btn-xs btn-default">&Oslash;</button>
                         </td>
                         <td>
                             <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
@@ -139,8 +136,8 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                                id="control_zm_position_label">Zm</span>:<span
+                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                            <span id="control_zm_position_label">Zm</span>:<span
                                                 id="control_zm_position">&nbsp;</span></span>
                                     </td>
                                 </tr>
@@ -151,18 +148,18 @@
             </div>
         </div>
         <br>
-        <div class="position-container hide_it" id="positions_labels2">
-            <div class="position_text hide_it" id="control_a_position_display">
+        <div id="positions_labels2" class="position-container hide_it">
+            <div id="control_a_position_display" class="position_text hide_it">
                 <table>
                     <tr>
                         <td>
-                            <button class="btn btn-xs btn-default" id="zero_a_btn"
-                                onclick="SendZerocommand('A0')">&Oslash;</button>
+                            <button id="zero_a_btn" class="btn btn-xs btn-default">&Oslash;</button>
                         </td>
                         <td>
-                            <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                    id="control_a_position_label">Aw</span>:<span
-                                    id="control_a_position">&nbsp;</span></span>
+                            <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                <span id="control_a_position_label">Aw</span>:<span
+                                    id="control_a_position">&nbsp;</span>
+                            </span>
                         </td>
                         <td>
                         </td>
@@ -175,9 +172,10 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                                id="control_am_position_label">Am</span>:<span
-                                                id="control_am_position">&nbsp;</span></span>
+                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                            <span id="control_am_position_label">Am</span>:<span
+                                                id="control_am_position">&nbsp;</span>
+                                        </span>
                                     </td>
                                 </tr>
                             </table>
@@ -185,17 +183,17 @@
                     </tr>
                 </table>
             </div>
-            <div class="position_text hide_it" id="control_b_position_display">
+            <div id="control_b_position_display" class="position_text hide_it">
                 <table>
                     <tr>
                         <td>
-                            <button class="btn btn-xs btn-default" id="zero_b_btn"
-                                onclick="SendZerocommand('B0')">&Oslash;</button>
+                            <button id="zero_b_btn" class="btn btn-xs btn-default">&Oslash;</button>
                         </td>
                         <td>
-                            <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                    id="control_b_position_label">Bw</span>:<span
-                                    id="control_b_position">&nbsp;</span></span>
+                            <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                <span id="control_b_position_label">Bw</span>:<span
+                                    id="control_b_position">&nbsp;</span>
+                            </span>
                         </td>
                         <td>
                         </td>
@@ -208,9 +206,10 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;"><span
-                                                id="control_bt_position_label">Bm</span>:<span
-                                                id="control_bm_position">&nbsp;</span></span>
+                                        <span class="label label-default" style="padding: 5px 5px 3px 5px;">
+                                            <span id="control_bt_position_label">Bm</span>:<span
+                                                id="control_bm_position">&nbsp;</span>
+                                        </span>
                                     </td>
                                 </tr>
                             </table>
@@ -222,13 +221,13 @@
                 <table>
                     <tr>
                         <td>
-                            <button class="btn btn-xs btn-default" id="zero_c_btn"
-                                onclick="SendZerocommand('C0')">&Oslash;</button>
+                            <button id="zero_c_btn" class="btn btn-xs btn-default">&Oslash;</button>
                         </td>
                         <td>
                             <span class="label label-default" style="padding: 5px 5px 3px 5px;">
                                 <span id="control_c_position_label">Cw</span>:<span
-                                    id="control_c_position">&nbsp;</span></span>
+                                    id="control_c_position">&nbsp;</span>
+                            </span>
                         </td>
                     </tr>
                     <tr id="control_zm_position_row">
@@ -241,7 +240,8 @@
                                     <td>
                                         <span class="label label-default" style="padding: 5px 5px 3px 5px;">
                                             <span id="control_cm_position_label">Cm</span>:<span
-                                                id="control_cm_position">&nbsp;</span></span>
+                                                id="control_cm_position">&nbsp;</span>
+                                        </span>
                                     </td>
                                 </tr>
                             </table>
@@ -262,8 +262,7 @@
                     </td>
                     <td>
                         <span class="input-group-addon hide_it"></span>
-                        <input id="control_xy_velocity" class="form-control w8" type="number" min="1"
-                            onchange="onXYvelocityChange()" />
+                        <input id="controlpanel_xy_feedrate" class="form-control w8" type="number" min="0.00001" />
                         <span class="input-group-addon form_control" translate>mm/min</span>
                     </td>
                 </tr>
@@ -273,23 +272,21 @@
             <table id="z_velocity_display" class="input-group">
                 <tr>
                     <td>
-                        <span class="input-group-addon form_control" id="axis_label">Z:</span>
+                        <span id="axis_label" class="input-group-addon form_control">Z:</span>
                         <input class="hide_it"></input>
                     </td>
-                    <td class="hide_it" id="axis_selection">
+                    <td id="axis_selection" class="hide_it">
                     </td>
                     <td>
                         <span class="input-group-addon hide_it"></span>
-                        <input id="control_z_velocity" class="form-control w5" type="number" min="1"
-                            onchange="onZvelocityChange()" />
+                        <input id="controlpanel_z_feedrate" class="form-control w5" type="number" min="0.00001" />
                         <span class="input-group-addon form_control" translate>mm/min</span>
                     </td>
                 </tr>
             </table>
 
             &nbsp;
-            <button id='motor_off_control' class="btn btn-primary" onclick="control_motorsOff()" translate>Motors
-                off</button>
+            <button id="motor_off_control" class="btn btn-primary" translate>Motors off</button>
         </div>
     </div>
 </div>
\ No newline at end of file