diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index fc1b9f265..0ae8c59e1 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -487,6 +487,7 @@
         "containers_info": "Container-Information",
         "container_running": "Läuft",
         "container_stopped": "Angehalten",
+        "cores": "Kerne",
         "current_time": "Systemzeit",
         "disk_usage": "Festplattennutzung",
         "docs": "Dokumente",
@@ -511,7 +512,7 @@
         "success": "Erfolg",
         "system_containers": "System & Container",
         "timezone": "Zeitzone",
-        "uptime": "Uptime",
+        "uptime": "Betriebszeit",
         "update_available": "Es ist ein Update verfügbar",
         "no_update_available": "Das System ist auf aktuellem Stand",
         "update_failed": "Es konnte nicht nach einem Update gesucht werden",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index 1a2c418b3..02a699a92 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -487,6 +487,7 @@
         "containers_info": "Container information",
         "container_running": "Running",
         "container_stopped": "Stopped",
+        "cores": "Cores",
         "current_time": "System Time",
         "disk_usage": "Disk usage",
         "docs": "Docs",
diff --git a/data/web/templates/debug.twig b/data/web/templates/debug.twig
index 81a386aa3..4b21cc47f 100644
--- a/data/web/templates/debug.twig
+++ b/data/web/templates/debug.twig
@@ -84,7 +84,7 @@
                         <td id="host_uptime" class="text-break">-</td>
                       </tr>
                       <tr>
-                        <td>Disk Info</td>
+                        <td>{{ lang.debug.disk_usage }}</td>
                         <td class="text-break">
                           <div>
                             <span class="d-block"><i class="bi bi-hdd-fill"></i> {{ vmail_df[0] }}</span>
@@ -104,11 +104,11 @@
 
               <div class="col-sm-6 mt-4">
                 <h3>CPU</h3>
-                <h5><span id="host_cpu_cores">-</span> Cores @ <span id="host_cpu_usage"></span></h5>
+                <h5><span id="host_cpu_cores">-</span> {{ lang.debug.cores }} @ <span id="host_cpu_usage"></span></h5>
                 <canvas id="host_cpu_chart" width="400" height="200"></canvas>
               </div>
               <div class="col-sm-6 mt-4">
-                <h3>MEMORY</h3>
+                <h3>{{ lang.debug.memory|upper}}</h3>
                 <h5><span id="host_memory_total">-</span> @ <span id="host_memory_usage"></span></h5>
                 <canvas id="host_mem_chart" width="400" height="200"></canvas>
               </div>
diff --git a/data/web/templates/mailbox.twig b/data/web/templates/mailbox.twig
index ccf46846a..382a206cd 100644
--- a/data/web/templates/mailbox.twig
+++ b/data/web/templates/mailbox.twig
@@ -3,15 +3,22 @@
 {% block content %}
 <div id="mail-content" class="responsive-tabs">
   <ul class="nav nav-tabs" role="tablist">
-    <li class="nav-item" role="presentation"><button class="nav-link active" aria-selected="false" aria-controls="tab-domains" role="tab" data-bs-toggle="tab" data-bs-target="#tab-domains">{{ lang.mailbox.domains }}</button></li>
-    <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-mailboxes" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mailboxes">{{ lang.mailbox.mailboxes }}</button></li>
-    {#  <li class="nav-item dropdown" role="presentation">
+    <li class="nav-item dropdown" role="presentation">
+    <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.domains }}</a>
+    <ul class="dropdown-menu">
+      <li><button class="dropdown-item" aria-selected="false" aria-controls="tab-mailboxes" role="tab" data-bs-toggle="tab" data-bs-target="#tab-domains">{{ lang.mailbox.domains }}</button></li>
+      <li><button class="dropdown-item" aria-selected="false" aria-controls="tab-mailbox-defaults" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mailbox-defaults">Default settings</button></li>
+    </ul>
+    </li>
+    {# <li class="nav-item" role="presentation"><button class="nav-link active" aria-selected="false" aria-controls="tab-domains" role="tab" data-bs-toggle="tab" data-bs-target="#tab-domains">{{ lang.mailbox.domains }}</button></li> #}
+    {# <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-mailboxes" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mailboxes">{{ lang.mailbox.mailboxes }}</button></li> #}
+    <li class="nav-item dropdown" role="presentation">
     <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.mailboxes }}</a>
     <ul class="dropdown-menu">
       <li><button class="dropdown-item" aria-selected="false" aria-controls="tab-mailboxes" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mailboxes">{{ lang.mailbox.mailboxes }}</button></li>
       <li><button class="dropdown-item" aria-selected="false" aria-controls="tab-mailbox-defaults" role="tab" data-bs-toggle="tab" data-bs-target="#tab-mailbox-defaults">{{ lang.mailbox.mailbox_defaults }}</button></li>
     </ul>
-    </li> #}
+    </li>
     <li class="nav-item" role="presentation"><button class="nav-link" aria-controls="tab-resources" role="tab" data-bs-toggle="tab" data-bs-target="#tab-resources">{{ lang.mailbox.resources }}</button></li>
     <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" data-bs-target="#">{{ lang.mailbox.aliases }}</a>