diff --git a/translate/translate.json b/translate/translate.json
index 9393d6c0..47175d9c 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -6740,7 +6740,7 @@
         "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1",
         "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->1",
         "default3.handlebars->35->1016",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->3"
       ]
@@ -10646,7 +10646,7 @@
         "default.handlebars->rfbPortContextMenu->1",
         "default.handlebars->sshPortContextMenu->1",
         "default3.handlebars->altPortContextMenu->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan->5->1->0",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan->5->1->0",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2sspan->5->1->0",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectsspan->5->1->0",
         "default3.handlebars->httpPortContextMenu->1",
@@ -12469,7 +12469,7 @@
       "xloc": [
         "default.handlebars->deskConnectContextMenu->3",
         "default.handlebars->filesShellContextMenu->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->5->3->0",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->5->3->0",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan->5->1->0"
       ]
     },
@@ -12500,7 +12500,7 @@
       "zh-cht": "詢問同意+工具欄",
       "xloc": [
         "default.handlebars->deskConnectContextMenu->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->5->1->0"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->5->1->0"
       ]
     },
     {
@@ -13199,7 +13199,7 @@
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "default.handlebars->container->column_l->p12->termTable->1->1->0->1->3",
         "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->3",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->autoconnectbutton2",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13AutoConnect",
         "sharing-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->0->1->3",
@@ -16128,7 +16128,7 @@
       "zh-cht": "更改遠程機器的電源狀態",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3"
       ]
     },
     {
@@ -17979,7 +17979,7 @@
       "zh-cht": "剪貼板",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "sharing.handlebars->p11->deskarea0->deskarea4->3"
       ]
     },
@@ -19634,7 +19634,7 @@
         "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->3",
         "default3.handlebars->35->2206",
         "default3.handlebars->35->983",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->connectbutton1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->connectbutton1",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2span->connectbutton2",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan->p13Connect",
         "mstsc.handlebars->main->1->3->1->12->1->0",
@@ -19879,8 +19879,8 @@
       "zh-cht": "使用 MeshAgent 遠程桌面連接",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1span",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2span",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2sspan",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan",
@@ -19914,7 +19914,7 @@
       "zh-cht": "使用 RDP 連接",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1rspan",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan"
       ]
     },
     {
@@ -19943,7 +19943,7 @@
       "zh-cht": "使用硬件 KVM 連接",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1hspan",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1hspan"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1hspan"
       ]
     },
     {
@@ -24543,7 +24543,7 @@
       "zh-cht": "桌面會話延遲",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3",
         "sharing.handlebars->p11->deskarea0->deskarea4->1"
       ]
     },
@@ -27125,8 +27125,8 @@
         "default.handlebars->deskDisconnectContextMenu->3",
         "default3.handlebars->35->2207",
         "default3.handlebars->35->984",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->5->3->0",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->disconnectbutton1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->5->3->0",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->disconnectbutton1",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->disconnectbutton2span->disconnectbutton2",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Disconnect",
         "sharing-mobile.handlebars->11->62",
@@ -27196,7 +27196,7 @@
       "zh-cht": "斷開連接並鎖定",
       "xloc": [
         "default.handlebars->deskDisconnectContextMenu->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->5->1->0"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->5->1->0"
       ]
     },
     {
@@ -27314,7 +27314,7 @@
         "default3.handlebars->35->446",
         "default3.handlebars->35->486",
         "default3.handlebars->35->8",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->deskstatus",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->deskstatus",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->termstatus",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Status",
         "sharing-mobile.handlebars->11->1",
@@ -27493,7 +27493,7 @@
       "zh-cht": "在遠程電腦上顯示通知",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -28560,7 +28560,7 @@
       "zh-cht": "將遠程剪貼板下載到本地剪貼板",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -29572,7 +29572,7 @@
         "default-mobile.handlebars->container->page_content->column_l->p10->p10terminal->termTable->termarea4->1->3",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5",
         "default.handlebars->container->column_l->p12->termTable->1->1->4->1->3",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "default3.handlebars->container->column_l->p12->termTable->1->1->4->1->1",
         "sharing.handlebars->p12->9->3"
       ]
@@ -30284,7 +30284,7 @@
       "zh-cht": "編輯遠程桌面設置",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "sharing.handlebars->p11->deskarea0->deskarea1->1"
       ]
     },
@@ -34834,7 +34834,7 @@
       "zh-cht": "全部關注",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3"
       ]
     },
     {
@@ -36017,7 +36017,7 @@
         "default.handlebars->container->column_l->p11->p11title->p11deviceNameHeader->devListToolbarViewIcons",
         "default.handlebars->container->column_l->p12->p12title->devListToolbarViewIcons2",
         "default.handlebars->container->column_l->p14->p14title->devListToolbarViewIcons",
-        "default3.handlebars->container->column_l->p11->p11title->devListToolbarViewIcons11",
+        "default3.handlebars->container->column_l->p11->p11title->devListToolbarViewIcons",
         "default3.handlebars->container->column_l->p12->p12title->devListToolbarViewIcons2",
         "default3.handlebars->container->column_l->p14->p14title->devListToolbarViewIcons"
       ]
@@ -38196,7 +38196,7 @@
         "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea1->1->3",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1hspan",
         "default.handlebars->container->column_l->p12->termTable->1->1->0->1->3->connectbutton2hspan",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1hspan->connectbutton1h",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1hspan->connectbutton1h",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2hspan->connectbutton2h",
         "sharing-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea1->1->3",
         "sharing.handlebars->p11->deskarea0->deskarea1->3->connectbutton1hspan"
@@ -40872,7 +40872,7 @@
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3->11->DeskControlSpan",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5->11->DeskControlSpan",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1->DeskControlSpan->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1->DeskControlSpan->1",
         "sharing-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3->5->DeskControlSpan",
         "sharing.handlebars->p11->deskarea0->deskarea4->3->9->DeskControlSpan"
       ]
@@ -49099,7 +49099,7 @@
       "zh-cht": "鎖定遠程計算機",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -54752,8 +54752,8 @@
         "default3.handlebars->35->2932",
         "default3.handlebars->35->341",
         "default3.handlebars->35->892",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->3",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->3",
         "default3.handlebars->container->column_l->p42->p42tbl->1->0->5"
       ]
     },
@@ -59696,7 +59696,7 @@
       "zh-cht": "在遠程電腦上打開一個網址",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -59728,7 +59728,7 @@
         "default.handlebars->47->1030",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "default3.handlebars->35->1027",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -60391,7 +60391,7 @@
         "default.handlebars->47->1470",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1",
         "default3.handlebars->35->1456",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader->1"
       ]
     },
     {
@@ -61867,7 +61867,7 @@
         "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1",
         "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->1",
         "default3.handlebars->35->1017",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->3"
       ]
@@ -63070,7 +63070,7 @@
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3"
       ]
     },
     {
@@ -63647,7 +63647,7 @@
       "zh-cht": "隱私欄",
       "xloc": [
         "default.handlebars->deskConnectContextMenu->5",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->5->5->0"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->5->5->0"
       ]
     },
     {
@@ -63883,7 +63883,7 @@
       "zh-cht": "進程",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabProcess"
       ]
     },
     {
@@ -64698,7 +64698,7 @@
       "zh-cht": "RDP 連接",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1rspan",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan->connectbutton1r"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan->connectbutton1r"
       ]
     },
     {
@@ -65346,7 +65346,7 @@
       "zh-cht": "將遠程桌面會話記錄到檔案",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -65706,7 +65706,7 @@
         "default.handlebars->container->column_l->p40->3->3",
         "default.handlebars->container->column_l->p52->3->1->0->3->3",
         "default3.handlebars->35->872",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsAreaTop->DeskToolsRefreshButton",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->DeskToolsRefreshButton",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->2->1->3",
         "default3.handlebars->container->column_l->p40->3->1",
         "default3.handlebars->container->column_l->p52->3->1->0->1->1",
@@ -65771,7 +65771,7 @@
       "zh-cht": "刷新桌面",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -67477,7 +67477,7 @@
       "zh-cht": "遠程輸入被鎖定",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -67507,7 +67507,7 @@
       "zh-cht": "遠程輸入已解鎖",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -70210,7 +70210,7 @@
       "zh-cht": "向左旋轉",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "sharing.handlebars->p11->deskarea0->deskarea1->1"
       ]
     },
@@ -70241,7 +70241,7 @@
       "zh-cht": "向右旋轉",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "sharing.handlebars->p11->deskarea0->deskarea1->1"
       ]
     },
@@ -70437,7 +70437,7 @@
       "uk": "Запустити сценарій на цьому комп'ютері",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -71967,7 +71967,7 @@
       "zh-cht": "保存遠程桌面的屏幕截圖",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3",
         "sharing.handlebars->p11->deskarea0->deskarea4->1"
       ]
     },
@@ -73236,7 +73236,7 @@
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5",
         "default.handlebars->container->column_l->p12->termTable->1->1->4->1->1->specialKeyDropDown",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "default3.handlebars->container->column_l->p12->termTable->1->1->4->1->3",
         "messenger.handlebars->xbottom->1->1->0->3",
         "sharing.handlebars->p11->deskarea0->deskarea4->3",
@@ -74834,7 +74834,7 @@
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
         "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1",
         "default.handlebars->container->column_l->p13->p13toolbar->1->0->1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->3",
         "messenger.handlebars->xtop->3",
@@ -75054,7 +75054,7 @@
       "zh-cht": "服務",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabService",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabService"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsAreaTop->deskToolsTopTabService"
       ]
     },
     {
@@ -75245,7 +75245,7 @@
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "default.handlebars->container->column_l->p12->termTable->1->1->4->1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3",
         "default3.handlebars->container->column_l->p12->termTable->1->1->4->1->3",
         "sharing.handlebars->p11->deskarea0->deskarea4->1",
         "sharing.handlebars->p12->9->1"
@@ -75552,7 +75552,7 @@
         "default-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3",
         "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->kvmListToolbar",
         "default3.handlebars->container->column_l->p1->devListToolbarSpan->kvmListToolbar",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "default3.handlebars->container->column_l->p4->3->1->0->1->3",
         "sharing-mobile.handlebars->container->page_content->column_l->p10->p10desktop->deskarea4->1->3"
       ]
@@ -75891,7 +75891,7 @@
       "zh-cht": "與訪客共享設備",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -78210,8 +78210,8 @@
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader",
         "default.handlebars->container->column_l->p13->p13toolbar->1->4->1->1->p13sortdropdown->1",
         "default.handlebars->container->column_l->p5->p5toolbar->1->2->p5filesubhead->1->p5sortdropdown->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->4->1->1->p13sortdropdown->1",
         "default3.handlebars->container->column_l->p5->p5toolbar->1->2->p5filesubhead->3->p5sortdropdown->1",
         "sharing-mobile.handlebars->container->page_content->column_l->p10->p10files->p13toolbar->1->4->1->1->1->0->3->p13sortdropdown->1",
@@ -78245,7 +78245,7 @@
       "zh-cht": "按進程ID排序",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsProcessTab->deskToolsHeader"
       ]
     },
     {
@@ -78311,7 +78311,7 @@
       "zh-cht": "按狀態排序",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader"
       ]
     },
     {
@@ -79840,7 +79840,7 @@
         "default.handlebars->47->1469",
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->1",
         "default3.handlebars->35->1455",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->1"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->DeskTools->deskToolsArea->DeskToolsServiceTab->deskToolsServiceHeader->1"
       ]
     },
     {
@@ -83833,9 +83833,9 @@
     {
       "en": "Toggle Dropdown",
       "xloc": [
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1rspan->connectbutton1rd->0",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->connectbutton1span->connectbutton1d->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->1->disconnectbutton1span->diconnectbutton1d->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1rspan->connectbutton1rd->0",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->connectbutton1span->connectbutton1d->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->1->disconnectbutton1span->diconnectbutton1d->1",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2span->connectbutton2d->0",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->1->connectbutton2sspan->connectbutton2sd->0",
         "default3.handlebars->container->column_l->p13->p13toolbar->1->0->1->1->p13Connectspan->p13Connectdrop->0",
@@ -83937,7 +83937,7 @@
       "zh-cht": "切換查看模式",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3",
         "player.handlebars->p11->deskarea0->deskarea1->1",
         "sharing.handlebars->p11->deskarea0->deskarea1->1"
       ]
@@ -83999,7 +83999,7 @@
       "zh-cht": "切換焦點模式，現用中僅更新鼠標周圍的區域",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3"
       ]
     },
     {
@@ -84059,7 +84059,7 @@
       "zh-cht": "切換鼠標和鍵盤輸入",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->5->11",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "sharing.handlebars->p11->deskarea0->deskarea4->3->9"
       ]
     },
@@ -84125,7 +84125,7 @@
       "zh-cht": "切換遠程桌面背景",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -84212,7 +84212,7 @@
       "zh-cht": "切換工具視圖",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -84392,7 +84392,7 @@
       "zh-cht": "工具",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -85134,7 +85134,7 @@
         "default3.handlebars->35->2276",
         "default3.handlebars->35->3158",
         "default3.handlebars->35->506",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->1",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
         "sharing.handlebars->p11->deskarea0->deskarea4->3"
       ]
     },
@@ -87286,7 +87286,7 @@
       "zh-cht": "將本地剪貼板上傳到遠程裝置",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea4->1",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->4->deskarea4->3"
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea4->3"
       ]
     },
     {
@@ -99589,7 +99589,7 @@
       "ru": "⇲",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1->5",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3->19",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3->19",
         "player.handlebars->p11->deskarea0->deskarea1->1->1",
         "sharing.handlebars->p11->deskarea0->deskarea1->1->3"
       ]
@@ -99741,7 +99741,7 @@
         "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsGoogleBackup->0->p2ServerActionsGoogleBackupCheck->0",
         "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsRestore->0->0->0",
         "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsVersion->0->0->0",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->p11bigok->0",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->p11bigok->0",
         "default3.handlebars->container->column_l->p13->p13filetable->p13bigok->0",
         "default3.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageAuthApp->1->authAppSetupCheck->0",
         "default3.handlebars->container->column_l->p2->p2info->p2AccountSecurity->3->manageDuoApp->1->authDuoSetupCheck->0",
@@ -99785,7 +99785,7 @@
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->1->idx_deskFullBtn2",
         "default.handlebars->container->column_l->p12->termTable->1->1->0->1->1->idx_termFullBtn2",
         "default.handlebars->container->dialog->dialogHeader->id_dialogclose",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->0->deskarea1->3->idx_deskFullBtn2",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea1->3->idx_deskFullBtn2",
         "default3.handlebars->container->column_l->p12->termTable->1->1->0->1->3->idx_termFullBtn2",
         "player.handlebars->p11->dialog->dialogHeader->id_dialogclose",
         "sharing.handlebars->dialog->dialogHeader->id_dialogclose",
@@ -99815,7 +99815,7 @@
         "default.handlebars->container->column_l->p11->deskarea0->deskarea3x->p11bigfail->0",
         "default.handlebars->container->column_l->p13->p13filetable->p13bigfail->0",
         "default.handlebars->container->column_l->p5->p5filetable->bigfail->0",
-        "default3.handlebars->container->column_l->p11->deskarea0->1->1->2->deskarea3x->p11bigfail->0",
+        "default3.handlebars->container->column_l->p11->deskarea0->deskarea3x->p11bigfail->0",
         "default3.handlebars->container->column_l->p13->p13filetable->p13bigfail->0",
         "default3.handlebars->container->column_l->p5->p5filetable->bigfail->0",
         "player.handlebars->p11->deskarea0->deskarea3x->bigfail->0",
diff --git a/views/default.handlebars b/views/default.handlebars
index bb622859..bdecac2a 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -13280,7 +13280,7 @@
                 x += '<div id=d2devrelaydiv style=display:none>';
                 relayDevices.sort(nameSort);
                 var relayDevices2 = [];
-                for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + '</option>'); }
+                for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + ' (' + EscapeHtml(relayDevices[i].meshnamel) + ')' + '</option>'); }
                 x += addHtmlValue("Relay Device", '<div style=width:230px;margin:0;padding:0><select id=d2devrelay style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) >' + relayDevices2.join('') + '</select></div>');
                 x += '</div>';
             }
@@ -13559,7 +13559,7 @@
             if (((currentMesh.mtype == 3) || (currentMesh.mtype == 4)) && (currentMesh.relayid != null)) {
                 var relayName = '<i>' + "Unknown" + '</i>';
                 var relayNode = getNodeFromId(currentMesh.relayid);
-                if (relayNode != null) { relayName = EscapeHtml(relayNode.name); }
+                if (relayNode != null) { relayName = EscapeHtml(relayNode.name) + ' (' + EscapeHtml(relayNode.meshnamel) + ')'; }
                 x += addHtmlValue("Relay Device", addLinkConditional(relayName, 'p20editmeshrelay()', (meshrights & 1) != 0));
             }
 
@@ -13976,7 +13976,7 @@
                 setDialogMode(2, "Edit Device Group", 1, null, "No relay devices available.");
             } else {
                 var relayDevices2 = [];
-                for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + '</option>'); }
+                for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + ' (' + EscapeHtml(relayDevices[i].meshnamel) + ')' + '</option>'); }
                 var x = addHtmlValue("Relay Device", '<div style=width:230px;margin:0;padding:0><select id=d2devrelay style=width:100%>' + relayDevices2.join('') + '</select></div>');
                 setDialogMode(2, "Edit Device Group", 3, p20editmeshrelayEx, x);
             }
diff --git a/views/default3.handlebars b/views/default3.handlebars
index 693175c6..3f0a0fd9 100644
--- a/views/default3.handlebars
+++ b/views/default3.handlebars
@@ -14287,7 +14287,7 @@
                 x += '<div id=d2devrelaydiv style=display:none>';
                 relayDevices.sort(nameSort);
                 var relayDevices2 = [];
-                for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + '</option>'); }
+                for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + ' (' + EscapeHtml(relayDevices[i].meshnamel) + ')' + '</option>'); }
                 x += addHtmlFormFloating("Relay Device", '<select id=d2devrelay onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) class=form-select >' + relayDevices2.join('') + '</select>');
                 x += '</div>';
             }
@@ -14601,7 +14601,7 @@
             if (((currentMesh.mtype == 3) || (currentMesh.mtype == 4)) && (currentMesh.relayid != null)) {
                 var relayName = '<i>' + "Unknown" + '</i>';
                 var relayNode = getNodeFromId(currentMesh.relayid);
-                if (relayNode != null) { relayName = EscapeHtml(relayNode.name); }
+                if (relayNode != null) { relayName = EscapeHtml(relayNode.name) + ' (' + EscapeHtml(relayNode.meshnamel) + ')'; }
                 x += addHtmlValue("Relay Device", addLinkConditional(relayName, 'p20editmeshrelay()', (meshrights & 1) != 0));
             }
 
@@ -15037,7 +15037,7 @@
                 showModal('xxAddAgentModal', 'idx_dlgOkButton');
             } else {
                 var relayDevices2 = [];
-                for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + '</option>'); }
+                for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + ' (' + EscapeHtml(relayDevices[i].meshnamel) + ')' + '</option>'); }
                 var x = addHtmlFormFloating("Relay Device", '<select id=d2devrelay class="form-select">' + relayDevices2.join('') + '</select>');
                 setModalContent('xxAddAgent', "Edit Device Group", x);
                 showModal('xxAddAgentModal', 'idx_dlgOkButton', p20editmeshrelayEx);