diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index f11a6d3a..9ddf93a6 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -372,27 +372,33 @@ export default function App() {
     return t("providerHintWebde");
   };
 
+  const cleanupDisabled = true;
+
   if (!isAuthenticated) {
     return (
       <div className="app auth">
         <header className="topbar">
           <div>
             <p className="badge">v0.1</p>
-            <h1>{t("appName")}</h1>
+            <h1>
+              <a className="brand-link" href="/">{t("appName")}</a>
+            </h1>
             <p className="tagline">{t("tagline")}</p>
           </div>
           <div className="lang-compact" aria-label={t("language")}>
             <div className="lang-buttons">
-              {languages.map((lang) => (
-                <button
-                  key={lang.code}
-                  type="button"
-                  className={activeLang === lang.code ? "active" : ""}
-                  onClick={() => switchLanguage(lang.code)}
-                >
-                  {lang.code.toUpperCase()}
-                </button>
-              ))}
+              <select
+                className="lang-select"
+                value={activeLang}
+                onChange={(event) => switchLanguage(event.target.value)}
+                aria-label={t("language")}
+              >
+                {languages.map((lang) => (
+                  <option key={lang.code} value={lang.code}>
+                    {lang.code.toUpperCase()}
+                  </option>
+                ))}
+              </select>
             </div>
           </div>
         </header>
@@ -440,23 +446,44 @@ export default function App() {
       <header className="topbar">
         <div>
           <p className="badge">v0.1</p>
-          <h1>{t("appName")}</h1>
-          <p className="tagline">{tenant?.name ?? t("tenantFallback")}</p>
+          <h1>
+            <a
+              className="brand-link"
+              href="/"
+              onClick={() => setShowAdmin(false)}
+            >
+              {t("appName")}
+            </a>
+          </h1>
+          {user?.role === "ADMIN" && (
+            <p className="tagline">{tenant?.name ?? t("tenantFallback")}</p>
+          )}
         </div>
         <div className="lang-compact">
           <span className="user-label">{user?.email ?? ""}</span>
           <div className="lang-buttons">
-            {languages.map((lang) => (
+            {user?.role === "ADMIN" && (
               <button
-                key={lang.code}
+                className="ghost admin-toggle"
                 type="button"
-                className={activeLang === lang.code ? "active" : ""}
-                onClick={() => switchLanguage(lang.code)}
+                onClick={() => setShowAdmin((prev) => !prev)}
               >
-                {lang.code.toUpperCase()}
+                {showAdmin ? t("userWorkspace") : t("adminConsole")}
               </button>
-            ))}
-            <button type="button" onClick={handleLogout}>{t("logout")}</button>
+            )}
+            <button className="ghost logout-button" type="button" onClick={handleLogout}>{t("logout")}</button>
+            <select
+              className="lang-select"
+              value={activeLang}
+              onChange={(event) => switchLanguage(event.target.value)}
+              aria-label={t("language")}
+            >
+              {languages.map((lang) => (
+                <option key={lang.code} value={lang.code}>
+                  {lang.code.toUpperCase()}
+                </option>
+              ))}
+            </select>
           </div>
         </div>
       </header>
@@ -467,7 +494,13 @@ export default function App() {
             <h2>{t("welcome")}</h2>
             <p className="description">{t("description")}</p>
             <div className="actions">
-              <button className="primary" type="button" onClick={handleStartCleanup}>
+              <button
+                className="primary"
+                type="button"
+                onClick={handleStartCleanup}
+                disabled={cleanupDisabled}
+                title={t("cleanupDisabled")}
+              >
                 {t("start")}
               </button>
             </div>
@@ -498,19 +531,6 @@ export default function App() {
           </div>
         </section>
 
-        {user?.role === "ADMIN" && (
-          <div className="admin-switch">
-            <button
-              className="ghost"
-              type="button"
-              onClick={() => setShowAdmin((prev) => !prev)}
-            >
-              {showAdmin ? t("userWorkspace") : t("adminConsole")}
-            </button>
-            <span className="status-badge">{t("admin")}</span>
-          </div>
-        )}
-
         {user?.role === "ADMIN" && showAdmin ? (
           <section className="admin-only">
             <div className="section-header">
@@ -604,7 +624,13 @@ export default function App() {
               </label>
             </div>
             <div className="card-actions">
-              <button className="primary" type="button" onClick={handleStartCleanup}>
+              <button
+                className="primary"
+                type="button"
+                onClick={handleStartCleanup}
+                disabled={cleanupDisabled}
+                title={t("cleanupDisabled")}
+              >
                 {t("start")}
               </button>
             </div>
diff --git a/frontend/src/locales/de/translation.json b/frontend/src/locales/de/translation.json
index d27678e3..1f0cd9a3 100644
--- a/frontend/src/locales/de/translation.json
+++ b/frontend/src/locales/de/translation.json
@@ -70,6 +70,7 @@
   "cleanupDryRun": "Dry run (keine Änderungen)",
   "cleanupUnsubscribe": "Unsubscribe aktiv",
   "cleanupRouting": "Routing aktiv",
+  "cleanupDisabled": "Bereinigung ist noch nicht verfügbar.",
   "rulesTitle": "Regeln",
   "rulesName": "Rule Name",
   "rulesEnabled": "Rule aktiv",
diff --git a/frontend/src/locales/en/translation.json b/frontend/src/locales/en/translation.json
index f4fa1415..6768e698 100644
--- a/frontend/src/locales/en/translation.json
+++ b/frontend/src/locales/en/translation.json
@@ -70,6 +70,7 @@
   "cleanupDryRun": "Dry run (no changes)",
   "cleanupUnsubscribe": "Unsubscribe enabled",
   "cleanupRouting": "Routing enabled",
+  "cleanupDisabled": "Cleanup is not available yet.",
   "rulesTitle": "Rules",
   "rulesName": "Rule name",
   "rulesEnabled": "Rule enabled",
diff --git a/frontend/src/styles.css b/frontend/src/styles.css
index 15bfb7e2..a4158987 100644
--- a/frontend/src/styles.css
+++ b/frontend/src/styles.css
@@ -115,6 +115,40 @@ h1 {
   margin-bottom: 6px;
 }
 
+.brand-link {
+  color: inherit;
+  text-decoration: none;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+  gap: 10px;
+  letter-spacing: 0.01em;
+  position: relative;
+}
+
+.brand-link:hover {
+  text-decoration: none;
+  color: var(--primary-strong);
+}
+
+.brand-link::after {
+  content: "";
+  position: absolute;
+  left: 0;
+  bottom: -6px;
+  width: 42%;
+  height: 2px;
+  background: linear-gradient(90deg, rgba(37, 99, 235, 0.45), rgba(37, 99, 235, 0));
+  border-radius: 999px;
+  opacity: 0.6;
+  transition: width 0.2s ease, opacity 0.2s ease;
+}
+
+.brand-link:hover::after {
+  width: 60%;
+  opacity: 1;
+}
+
 .tagline {
   color: var(--muted);
   font-size: 16px;
@@ -135,23 +169,30 @@ h1 {
 .lang-buttons {
   display: flex;
   gap: 6px;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
+  align-items: center;
+  justify-content: flex-end;
 }
 
-.lang-compact button {
-  border: 1px solid var(--border);
-  background: #fff;
-  padding: 4px 8px;
-  border-radius: 999px;
+.lang-select {
+  border: 1px solid rgba(37, 99, 235, 0.25);
+  background: transparent;
+  padding: 2px 16px 2px 8px;
+  border-radius: 10px;
   cursor: pointer;
   font-size: 12px;
   font-weight: 600;
+  height: 22px;
+  width: 48px;
+  appearance: none;
 }
 
-.lang-compact button.active {
-  background: var(--primary);
-  color: #fff;
-  border-color: var(--primary);
+.admin-toggle {
+  border-style: dashed;
+}
+
+.logout-button {
+  margin-left: auto;
 }
 
 .hero {