diff --git a/js/kiri-init.js b/js/kiri-init.js
index e92525cf..eef03c75 100644
--- a/js/kiri-init.js
+++ b/js/kiri-init.js
@@ -1448,16 +1448,6 @@ var gs_kiri_init = exports;
             layerMoves:    UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE})
         });
 
-        if (!lang_set) {
-            // for english only, add underlined labels for hotkeys
-            UI.setupDevices.innerHTML   = "D<u>e</u>vices";
-            UI.setupTools.innerHTML     = "T<u>o</u>ols";
-            UI.modeArrange.innerHTML    = "<u>A</u>rrange";
-            UI.modeSlice.innerHTML      = "<u>S</u>lice";
-            UI.modePreview.innerHTML    = "<u>P</u>review";
-            UI.modeExport.innerHTML     = "E<u>x</u>port";
-        }
-
         // populate language drop-down
         let lp = $('langpop');
         let elp = DOC.createElement("div");
diff --git a/js/kiri.js b/js/kiri.js
index 2f2adf26..860c4aa9 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -65,6 +65,9 @@ self.kiri.copyright = exports.COPYRIGHT;
     if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]);
     DBUG.enable();
 
+    // remove version, preserve other settings
+    WIN.history.replaceState({},'','/kiri/' + encodeOpt(SETUP) + LOC.hash);
+
     // add show() to catalog for API
     CATALOG.show = showCatalog;
 
@@ -404,6 +407,7 @@ self.kiri.copyright = exports.COPYRIGHT;
         let opt = {}, kv, kva;
         // handle kiri legacy and proper url encoding better
         ov.replace(/&/g,',').split(',').forEach(function(el) {
+            el = el.replace(/=/g,':');
             kv = decodeURIComponent(el).split(':');
             if (kv.length === 2) {
                 kva = opt[kv[0]] = opt[kv[0]] || [];
@@ -413,6 +417,16 @@ self.kiri.copyright = exports.COPYRIGHT;
         return opt;
     }
 
+    function encodeOpt(opt) {
+        let out = [];
+        Object.keys(opt).forEach(key => {
+            if (key === 'ver') return;
+            let val = opt[key];
+            out.push(encodeURIComponent(key) + "=" + encodeURIComponent(val));
+        });
+        return out.length ? '?' + out.join('&') : '';
+    }
+
     function ajax(url, fn, rt, po, hd) {
         return new MOTO.Ajax(fn, rt).request(url, po, hd);
     }
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js
index 9d32f424..fb91fed6 100644
--- a/web/kiri/lang/en.js
+++ b/web/kiri/lang/en.js
@@ -99,12 +99,12 @@ kiri.lang['en-us'] = {
 
     // VIEW
     vu_menu:        "view",
-    vu_home:        "home",
-    vu_rset:        "reset",
-    vu_sptp:        "top",
-    vu_spfr:        "front",
-    vu_splt:        "left",
-    vu_sprt:        "right",
+    vu_home:        "Home",
+    vu_rset:        "Reset",
+    vu_sptp:        "Top",
+    vu_spfr:        "Front",
+    vu_splt:        "Left",
+    vu_sprt:        "Right",
 
     // WORKSPACE
     ws_menu:        "workspace",