diff --git a/src/kiri/app/menubar.js b/src/kiri/app/menubar.js
index 26966969..c01fff46 100644
--- a/src/kiri/app/menubar.js
+++ b/src/kiri/app/menubar.js
@@ -53,7 +53,7 @@ function topMenu(actions, { text, lk, iconClass, side = 'left', right = false, i
 
 function toolbarToolNozzle() {
     return span({ id: 'tool-nozzle' }, [
-        i({ class: 'fas fa-location-pin', title: 'extruder' }),
+        label({ lk: 'tool', _: tr('tool', 'tool') }),
         div({ id: 'ft-nozzle', class: 'f-col pop' })
     ]);
 }
@@ -143,8 +143,25 @@ function content(actions) {
                     menuItem(actions, { id: 'app-quit', lk: 'quit', text: 'quit', className: 'hide' })
                 ]
             }),
+            topMenu(actions, {
+                text: 'edit', lk: 'ed_menu', items: [
+                    menuItem(actions, { id: 'context-layflat', lk: 'rc_lafl', text: 'face down', iconClass: 'fas fa-angle-double-down' }),
+                    menuItem(actions, { id: 'context-lefty', lk: 'face_left', text: 'face left', iconClass: 'fas fa-angle-double-left' }),
+                    hr(),
+                    menuItem(actions, { id: 'context-mirror', lk: 'rc_mirr', text: 'mirror', iconClass: 'fas fa-arrows-left-right-to-line' }),
+                    menuItem(actions, { id: 'context-duplicate', lk: 'rc_dupl', text: 'duplicate', iconClass: 'fas fa-copy' }),
+                    hr(),
+                    menuItem(actions, { id: 'context-rotate-panel', text: 'rotate', iconClass: 'fas fa-rotate-right' }),
+                    menuItem(actions, { id: 'context-scale-panel', text: 'scale / size', iconClass: 'fas fa-expand' }),
+                    hr(),
+                    menuItem(actions, { id: 'mesh-merge', lk: 'rc_merg', text: 'merge meshes' }),
+                    menuItem(actions, { id: 'mesh-split', lk: 'rc_splt', text: 'isolate meshes' }),
+                ]
+            }),
             topMenu(actions, {
                 text: 'view', lk: 'vu_menu', items: [
+                    menuItem(actions, { id: 'context-setfocus', lk: 'rc_focs', text: 'focal point', iconClass: 'fas fa-eye' }),
+                    hr(),
                     menuItem(actions, { id: 'view-fit', lk: 'contents', text: 'contents', iconClass: 'fas fa-arrows-to-circle' }),
                     menuItem(actions, { id: 'view-home', lk: 'home', text: 'home', iconClass: 'fas fa-home' }),
                     menuItem(actions, { id: 'view-top', lk: 'top', text: 'top', iconClass: 'fas fa-square' }),
@@ -152,13 +169,6 @@ function content(actions) {
                     menuItem(actions, { id: 'app-xpnd', lk: 'fullscreen', text: 'fullscreen', iconClass: 'fas fa-maximize' })
                 ]
             }),
-            topMenu(actions, {
-                text: 'Align', lk: 'al_menu', items: [
-                    menuItem(actions, { id: 'context-setfocus', lk: 'rc_focs', text: 'focal point', iconClass: 'fas fa-eye' }),
-                    menuItem(actions, { id: 'context-layflat', lk: 'rc_lafl', text: 'face down', iconClass: 'fas fa-angle-double-down' }),
-                    menuItem(actions, { id: 'context-lefty', lk: 'face_left', text: 'face left', iconClass: 'fas fa-angle-double-left' })
-                ]
-            }),
             topMenu(actions, {
                 text: 'render', lk: 're_menu', items: [
                     menuItem(actions, { id: 'render-solid', lk: 'solid', text: 'solid', iconClass: 'fas fa-square' }),
@@ -168,18 +178,6 @@ function content(actions) {
                     menuItem(actions, { id: 'render-edges', lk: 're_edgs', text: 'toggle edges', iconClass: 'fa-regular fa-square' })
                 ]
             }),
-            topMenu(actions, {
-                text: 'selection', lk: 'sx_menu', items: [
-                    menuItem(actions, { id: 'context-mirror', lk: 'rc_mirr', text: 'mirror', iconClass: 'fas fa-arrows-left-right-to-line' }),
-                    menuItem(actions, { id: 'context-duplicate', lk: 'rc_dupl', text: 'duplicate', iconClass: 'fas fa-copy' }),
-                    hr(),
-                    menuItem(actions, { id: 'context-rotate-panel', text: 'rotate', iconClass: 'fas fa-rotate-right' }),
-                    menuItem(actions, { id: 'context-scale-panel', text: 'scale / size', iconClass: 'fas fa-expand' }),
-                    hr(),
-                    menuItem(actions, { id: 'mesh-merge', lk: 'rc_merg', text: 'merge meshes' }),
-                    menuItem(actions, { id: 'mesh-split', lk: 'rc_splt', text: 'isolate meshes' }),
-                ]
-            }),
             // div({ class: 'menubar-separator' }),
             div({ class: 'f-row top-menu' }, [
                 toolbarToolNozzle()
diff --git a/src/main/kiri.js b/src/main/kiri.js
index 89f5d388..385d8d61 100644
--- a/src/main/kiri.js
+++ b/src/main/kiri.js
@@ -49,8 +49,10 @@ async function checkReady() {
         if (api.electron) {
             $('install').classList.add('hide');
             $('app-quit').classList.remove('hide');
-            $('app-name-text').innerText = "More Info";
-            $('top-sep').style.display = 'flex';
+            const appNameText = $('app-name-text') || document.querySelector('.menubar-appname');
+            if (appNameText) appNameText.innerText = "More Info";
+            const topSep = $('top-sep');
+            if (topSep) topSep.style.display = 'flex';
         } else if (bootctrl) {
             $('install').classList.add('hide');
             $('uninstall').classList.remove('hide');
diff --git a/web/kiri/lang/da.js b/web/kiri/lang/da.js
index bebf8207..8e811c41 100644
--- a/web/kiri/lang/da.js
+++ b/web/kiri/lang/da.js
@@ -68,11 +68,13 @@ self.lang['da-dk'] = {
     al_menu:        "juster",
     re_menu:        "render",
     sx_menu:        "markering",
+    ed_menu:        "rediger",
     face_left:      "venstre side",
     re_edgs:        "skift kanter",
     al_menu:        "juster",
     re_menu:        "render",
     sx_menu:        "markering",
+    ed_menu:        "rediger",
     face_left:      "venstre side",
     re_edgs:        "skift kanter",
 
diff --git a/web/kiri/lang/de-de.js b/web/kiri/lang/de-de.js
index b0000115..c26f87f5 100644
--- a/web/kiri/lang/de-de.js
+++ b/web/kiri/lang/de-de.js
@@ -69,11 +69,13 @@ self.lang['de-de'] = {
     al_menu:        "ausrichten",
     re_menu:        "rendern",
     sx_menu:        "auswahl",
+    ed_menu:        "Bearbeiten",
     face_left:      "linke seite",
     re_edgs:        "kanten umschalten",
     al_menu:        "ausrichten",
     re_menu:        "rendern",
     sx_menu:        "auswahl",
+    ed_menu:        "Bearbeiten",
     face_left:      "linke seite",
     re_edgs:        "kanten umschalten",
 
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js
index 5f59075a..dacea987 100644
--- a/web/kiri/lang/en.js
+++ b/web/kiri/lang/en.js
@@ -70,11 +70,13 @@ self.lang['en-us'] = {
     al_menu:        "align",
     re_menu:        "render",
     sx_menu:        "selection",
+    ed_menu:        "edit",
     face_left:      "face left",
     re_edgs:        "toggle edges",
     al_menu:        "align",
     re_menu:        "render",
     sx_menu:        "selection",
+    ed_menu:        "edit",
     face_left:      "face left",
     re_edgs:        "toggle edges",
 
diff --git a/web/kiri/lang/es-es.js b/web/kiri/lang/es-es.js
index dff63474..1862470c 100644
--- a/web/kiri/lang/es-es.js
+++ b/web/kiri/lang/es-es.js
@@ -69,11 +69,13 @@ self.lang['es-es'] = {
     al_menu:        "alinear",
     re_menu:        "renderizar",
     sx_menu:        "selección",
+    ed_menu:        "editar",
     face_left:      "cara izquierda",
     re_edgs:        "alternar bordes",
     al_menu:        "alinear",
     re_menu:        "renderizar",
     sx_menu:        "selección",
+    ed_menu:        "editar",
     face_left:      "cara izquierda",
     re_edgs:        "alternar bordes",
 
diff --git a/web/kiri/lang/fr.js b/web/kiri/lang/fr.js
index c24e51e6..40e2ca78 100644
--- a/web/kiri/lang/fr.js
+++ b/web/kiri/lang/fr.js
@@ -69,11 +69,13 @@ self.lang['fr-fr'] = {
     al_menu:        "aligner",
     re_menu:        "rendu",
     sx_menu:        "sélection",
+    ed_menu:        "éditer",
     face_left:      "face gauche",
     re_edgs:        "basculer arêtes",
     al_menu:        "aligner",
     re_menu:        "rendu",
     sx_menu:        "sélection",
+    ed_menu:        "éditer",
     face_left:      "face gauche",
     re_edgs:        "basculer arêtes",
 
diff --git a/web/kiri/lang/pl-pl.js b/web/kiri/lang/pl-pl.js
index edd833e7..17d0c93e 100644
--- a/web/kiri/lang/pl-pl.js
+++ b/web/kiri/lang/pl-pl.js
@@ -68,11 +68,13 @@ self.lang['pl-pl'] = {
     al_menu:        "wyrównaj",
     re_menu:        "renderuj",
     sx_menu:        "zaznaczenie",
+    ed_menu:        "edytuj",
     face_left:      "lewa ściana",
     re_edgs:        "przełącz krawędzie",
     al_menu:        "wyrównaj",
     re_menu:        "renderuj",
     sx_menu:        "zaznaczenie",
+    ed_menu:        "edytuj",
     face_left:      "lewa ściana",
     re_edgs:        "przełącz krawędzie",
 
diff --git a/web/kiri/lang/pt.js b/web/kiri/lang/pt.js
index dbaa2dbb..eac8c763 100644
--- a/web/kiri/lang/pt.js
+++ b/web/kiri/lang/pt.js
@@ -69,11 +69,13 @@ self.lang['pt-pt'] = {
     al_menu:        "alinhar",
     re_menu:        "renderizar",
     sx_menu:        "seleção",
+    ed_menu:        "editar",
     face_left:      "face esquerda",
     re_edgs:        "alternar arestas",
     al_menu:        "alinhar",
     re_menu:        "renderizar",
     sx_menu:        "seleção",
+    ed_menu:        "editar",
     face_left:      "face esquerda",
     re_edgs:        "alternar arestas",
 
diff --git a/web/kiri/lang/zh.js b/web/kiri/lang/zh.js
index 24dd5ebe..3ed4e4fd 100644
--- a/web/kiri/lang/zh.js
+++ b/web/kiri/lang/zh.js
@@ -68,6 +68,7 @@ self.lang['zh'] = {
     al_menu:        "对齐",
     re_menu:        "渲染",
     sx_menu:        "选择",
+    ed_menu:        "编辑",
     face_left:      "面朝左",
     re_edgs:        "切换边线",