diff --git a/server/backend/internal/httpapi/manage/templates.go b/server/backend/internal/httpapi/manage/templates.go
index 6cacc53..8127349 100644
--- a/server/backend/internal/httpapi/manage/templates.go
+++ b/server/backend/internal/httpapi/manage/templates.go
@@ -197,30 +197,70 @@ function dlFile(content, name) {
 </html>`
 
 const adminTmpl = `<!DOCTYPE html>
-<html lang="de" data-theme="light">
+<html lang="de">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="color-scheme" content="light">
-  <title>MORZ Infoboard – Admin</title>
+  <title>Admin – MORZ Infoboard</title>
   <link rel="stylesheet" href="/static/bulma.min.css">
   <style>
-    body { background: #f5f5f5; }
-    .tab-panel { display: none; }
-    .tab-panel.is-active { display: block; }
+    :root { --morz-red:#E30613; --morz-red-dark:#B8000F; --nav-bg:#1A1A2E; --bg:#F7F8FA; --surface:#FFFFFF; --shadow-sm:0 1px 4px rgba(0,0,0,.08); --shadow-md:0 4px 16px rgba(0,0,0,.12); --radius:8px; --radius-btn:6px; }
+    body { background:var(--bg); font-family:system-ui,-apple-system,"Segoe UI",sans-serif; }
+    .navbar { background:var(--nav-bg) !important; }
+    .navbar-item,.navbar-link { color:rgba(255,255,255,.85) !important; }
+    .navbar-item:hover,.navbar-link:hover { background:rgba(255,255,255,.08) !important; color:#fff !important; }
+    .morz-brand .accent { color:var(--morz-red); font-weight:800; }
+    .box { border-radius:var(--radius); box-shadow:var(--shadow-sm); }
+    .button.is-primary { background:var(--morz-red) !important; border-color:var(--morz-red) !important; border-radius:var(--radius-btn); }
+    .button.is-primary:hover { background:var(--morz-red-dark) !important; border-color:var(--morz-red-dark) !important; }
+    .button { border-radius:var(--radius-btn) !important; }
+    /* Underline tabs */
+    .tabs li.is-active a { border-bottom:3px solid var(--morz-red) !important; color:var(--morz-red) !important; font-weight:600; }
+    .tabs a { border-bottom:3px solid transparent; color:#374151; }
+    .tab-panel { display:none; }
+    .tab-panel.is-active { display:block; }
+    /* Screen cards */
+    .screen-card { background:var(--surface); border-radius:var(--radius); box-shadow:var(--shadow-sm); padding:1.25rem; display:flex; flex-direction:column; gap:.75rem; transition:box-shadow .15s; }
+    .screen-card:hover { box-shadow:var(--shadow-md); }
+    .screen-card-name { font-weight:700; font-size:1rem; display:flex; align-items:center; gap:.5rem; }
+    .screen-card-slug { font-family:monospace; font-size:.8rem; color:#6b7280; }
+    .screen-card-meta { display:flex; align-items:center; gap:.75rem; flex-wrap:wrap; }
+    .screen-card-actions { display:flex; gap:.5rem; margin-top:auto; }
+    .orient-badge { font-size:.7rem; background:#f3f4f6; color:#374151; padding:.2em .6em; border-radius:99px; font-weight:600; }
+    .status-dot { width:10px; height:10px; border-radius:50%; display:inline-block; }
+    .status-dot.online  { background:#22c55e; }
+    .status-dot.stale   { background:#f59e0b; }
+    .status-dot.offline { background:#ef4444; }
+    .status-dot.unknown { background:#9ca3af; }
+    /* Modal */
+    .modal-card { border-radius:var(--radius); overflow:hidden; }
+    .modal-card-head { background:var(--nav-bg); }
+    .modal-card-title { color:#fff; font-weight:700; }
+    .modal-card-head .delete { background:rgba(255,255,255,.2); }
+    /* Toasts */
+    .morz-toast { position:fixed; top:1rem; right:1rem; z-index:9999; max-width:380px;
+                   border-radius:24px; box-shadow:var(--shadow-md); padding:.75rem 1.25rem;
+                   display:flex; align-items:center; gap:.75rem; font-size:.9rem;
+                   transform:translateX(120%); transition:transform .25s ease; }
+    .morz-toast.show { transform:translateX(0); }
+    .morz-toast.is-success { background:#f0fdf4; color:#166534; border:1px solid #bbf7d0; }
+    .morz-toast.is-danger  { background:#fef2f2; color:#991b1b; border:1px solid #fecaca; }
+    .morz-toast.is-warning { background:#fffbeb; color:#92400e; border:1px solid #fde68a; }
+    /* Form polish */
+    .input:focus,.select select:focus { border-color:var(--morz-red); box-shadow:0 0 0 3px rgba(227,6,19,.12); outline:none; }
+    details summary { cursor:pointer; user-select:none; }
   </style>
 </head>
 <body>
-<nav class="navbar is-dark" role="navigation" aria-label="main navigation">
+
+<nav class="navbar" role="navigation" aria-label="main navigation">
   <div class="navbar-brand">
-    <span class="navbar-item"><strong>📺 MORZ Infoboard</strong></span>
-    <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="adminNavbar">
-      <span aria-hidden="true"></span>
-      <span aria-hidden="true"></span>
-      <span aria-hidden="true"></span>
+    <span class="navbar-item morz-brand"><span class="accent">MORZ</span> Infoboard</span>
+    <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="adminNav">
+      <span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span>
     </a>
   </div>
-  <div id="adminNavbar" class="navbar-menu">
+  <div id="adminNav" class="navbar-menu">
     <div class="navbar-start">
       <a class="navbar-item" href="/status">Diagnose</a>
     </div>
@@ -228,306 +268,165 @@ const adminTmpl = `<!DOCTYPE html>
       <div class="navbar-item">
         <form method="POST" action="/logout">
           <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
-          <button class="button is-white is-outlined is-small" type="submit">Abmelden</button>
+          <button class="button is-outlined is-small" style="color:rgba(255,255,255,.85);border-color:rgba(255,255,255,.35)" type="submit">Abmelden</button>
         </form>
       </div>
     </div>
   </div>
 </nav>
 
-<!-- Lösch-Bestätigungs-Modal (Screens) -->
-<div id="delete-modal" class="modal">
-  <div class="modal-background" onclick="closeDeleteModal()"></div>
+<!-- Delete screen modal -->
+<div id="del-modal" class="modal">
+  <div class="modal-background" onclick="closeModal('del-modal')"></div>
   <div class="modal-card">
     <header class="modal-card-head">
       <p class="modal-card-title">Bildschirm löschen?</p>
-      <button class="delete" aria-label="Schließen" onclick="closeDeleteModal()"></button>
+      <button class="delete" onclick="closeModal('del-modal')"></button>
     </header>
     <section class="modal-card-body">
-      <p>Soll <strong id="delete-modal-name"></strong> wirklich gelöscht werden?</p>
+      <p>Soll <strong id="del-name"></strong> wirklich gelöscht werden?</p>
       <p class="help has-text-grey mt-2">Alle Playlist-Einträge werden ebenfalls gelöscht.</p>
     </section>
-    <footer class="modal-card-foot">
-      <form id="delete-modal-form" method="POST">
-        <button class="button is-danger" type="submit">Wirklich löschen</button>
-      </form>
-      <button class="button" onclick="closeDeleteModal()">Abbrechen</button>
+    <footer class="modal-card-foot" style="gap:.5rem">
+      <form id="del-form" method="POST"><button class="button is-danger" type="submit">Wirklich löschen</button></form>
+      <button class="button" onclick="closeModal('del-modal')">Abbrechen</button>
     </footer>
   </div>
 </div>
 
-<!-- Lösch-Bestätigungs-Modal (User) -->
-<div id="delete-user-modal" class="modal">
-  <div class="modal-background" onclick="closeDeleteUserModal()"></div>
+<!-- Delete user modal -->
+<div id="del-user-modal" class="modal">
+  <div class="modal-background" onclick="closeModal('del-user-modal')"></div>
   <div class="modal-card">
     <header class="modal-card-head">
       <p class="modal-card-title">Benutzer löschen?</p>
-      <button class="delete" aria-label="Schließen" onclick="closeDeleteUserModal()"></button>
+      <button class="delete" onclick="closeModal('del-user-modal')"></button>
     </header>
     <section class="modal-card-body">
-      <p>Soll Benutzer <strong id="delete-user-modal-name"></strong> wirklich gelöscht werden?</p>
-      <p class="help has-text-grey mt-2">Alle Screen-Zuordnungen werden ebenfalls entfernt.</p>
+      <p>Soll <strong id="del-user-name"></strong> wirklich gelöscht werden?</p>
+      <p class="help has-text-grey mt-2">Alle Screen-Zuordnungen werden entfernt.</p>
     </section>
-    <footer class="modal-card-foot">
-      <form id="delete-user-modal-form" method="POST">
-        <button class="button is-danger" type="submit">Wirklich löschen</button>
-      </form>
-      <button class="button" onclick="closeDeleteUserModal()">Abbrechen</button>
+    <footer class="modal-card-foot" style="gap:.5rem">
+      <form id="del-user-form" method="POST"><button class="button is-danger" type="submit">Wirklich löschen</button></form>
+      <button class="button" onclick="closeModal('del-user-modal')">Abbrechen</button>
     </footer>
   </div>
 </div>
 
-<!-- Screen-User-Verwaltungs-Modal -->
+<!-- Screen users modal -->
 <div id="screen-users-modal" class="modal">
-  <div class="modal-background" onclick="closeScreenUsersModal()"></div>
-  <div class="modal-card" style="width:600px;max-width:95vw">
+  <div class="modal-background" onclick="closeModal('screen-users-modal')"></div>
+  <div class="modal-card" style="width:580px;max-width:95vw">
     <header class="modal-card-head">
-      <p class="modal-card-title" id="screen-users-modal-title">Benutzer verwalten</p>
-      <button class="delete" aria-label="Schließen" onclick="closeScreenUsersModal()"></button>
+      <p class="modal-card-title" id="su-modal-title">Benutzer verwalten</p>
+      <button class="delete" onclick="closeModal('screen-users-modal')"></button>
     </header>
-    <section class="modal-card-body" id="screen-users-modal-body">
-    </section>
+    <section class="modal-card-body" id="su-modal-body"></section>
     <footer class="modal-card-foot">
-      <button class="button" onclick="closeScreenUsersModal()">Schließen</button>
+      <button class="button" onclick="closeModal('screen-users-modal')">Schließen</button>
     </footer>
   </div>
 </div>
 
-<script>
-(function() {
-  var burger = document.querySelector('.navbar-burger[data-target="adminNavbar"]');
-  if (burger) {
-    burger.addEventListener('click', function() {
-      var target = document.getElementById(burger.dataset.target);
-      burger.classList.toggle('is-active');
-      target.classList.toggle('is-active');
-    });
-  }
-})();
-
-function openDeleteModal(action, name) {
-  document.getElementById('delete-modal-form').action = action;
-  document.getElementById('delete-modal-name').textContent = name;
-  document.getElementById('delete-modal').classList.add('is-active');
-}
-function closeDeleteModal() {
-  document.getElementById('delete-modal').classList.remove('is-active');
-}
-
-function openDeleteUserModal(action, name) {
-  document.getElementById('delete-user-modal-form').action = action;
-  document.getElementById('delete-user-modal-name').textContent = name;
-  document.getElementById('delete-user-modal').classList.add('is-active');
-}
-function closeDeleteUserModal() {
-  document.getElementById('delete-user-modal').classList.remove('is-active');
-}
-
-function openScreenUsersModal(screenId, screenName, html) {
-  document.getElementById('screen-users-modal-title').textContent = 'Benutzer: ' + screenName;
-  document.getElementById('screen-users-modal-body').innerHTML = html;
-  document.getElementById('screen-users-modal').classList.add('is-active');
-  // Re-inject CSRF tokens into newly added forms
-  injectCSRFNow();
-}
-function closeScreenUsersModal() {
-  document.getElementById('screen-users-modal').classList.remove('is-active');
-}
-
-document.addEventListener('keydown', function(e) {
-  if (e.key === 'Escape') {
-    closeDeleteModal();
-    closeDeleteUserModal();
-    closeScreenUsersModal();
-  }
-});
-</script>
-<script>
-(function() {
-  var msg = new URLSearchParams(window.location.search).get('msg');
-  if (!msg) return;
-  var texts = {
-    'uploaded':               '✓ Medium erfolgreich hochgeladen.',
-    'deleted':                '✓ Erfolgreich gelöscht.',
-    'saved':                  '✓ Änderungen gespeichert.',
-    'added':                  '✓ Erfolgreich hinzugefügt.',
-    'user_added':             '✓ Benutzer angelegt.',
-    'user_deleted':           '✓ Benutzer gelöscht.',
-    'user_added_to_screen':   '✓ Benutzer zum Screen hinzugefügt.',
-    'user_removed_from_screen': '✓ Benutzer vom Screen entfernt.',
-    'error_empty':            '⚠ Benutzername und Passwort erforderlich.',
-    'error_exists':           '⚠ Benutzername bereits vergeben.',
-    'error_db':               '⚠ Datenbankfehler.'
-  };
-  var isError = msg.startsWith('error_');
-  var text = texts[msg] || '✓ Aktion erfolgreich.';
-  var n = document.createElement('div');
-  n.className = 'notification ' + (isError ? 'is-warning' : 'is-success');
-  n.setAttribute('role', 'alert');
-  n.style.cssText = 'position:fixed;top:1rem;right:1rem;z-index:9999;max-width:380px;box-shadow:0 4px 12px rgba(0,0,0,.15)';
-  n.innerHTML = '<button class="delete"></button>' + text;
-  n.querySelector('.delete').addEventListener('click', function() { n.remove(); });
-  document.body.appendChild(n);
-  setTimeout(function() {
-    n.style.transition = 'opacity .5s';
-    n.style.opacity = '0';
-    setTimeout(function() { n.remove(); }, 500);
-  }, 3000);
-  var url = new URL(window.location.href);
-  url.searchParams.delete('msg');
-  history.replaceState(null, '', url.toString());
-})();
-</script>
-
-<section class="section pb-0 pt-3">
+<section class="section pb-0 pt-4">
   <div class="container">
-    <nav class="breadcrumb" aria-label="breadcrumb">
-      <ul>
-        <li class="is-active"><a href="#" aria-current="page">Admin</a></li>
-      </ul>
-    </nav>
-  </div>
-</section>
-
-<section class="section pt-2">
-  <div class="container">
-
-    <!-- Tabs -->
-    <div class="tabs is-boxed mb-0">
+    <nav class="breadcrumb mb-3"><ul><li class="is-active"><a>Admin</a></li></ul></nav>
+    <div class="tabs mb-0">
       <ul>
         <li id="tab-screens" class="{{if eq .ActiveTab "screens"}}is-active{{end}}">
-          <a><button type="button" role="tab" aria-selected="{{if eq .ActiveTab "screens"}}true{{else}}false{{end}}" onclick="switchTab('screens')" style="background:none;border:none;padding:0;cursor:pointer;font:inherit;color:inherit">Bildschirme</button></a>
+          <a onclick="switchTab('screens')" style="cursor:pointer">Bildschirme</a>
         </li>
         <li id="tab-users" class="{{if eq .ActiveTab "users"}}is-active{{end}}">
-          <a><button type="button" role="tab" aria-selected="{{if eq .ActiveTab "users"}}true{{else}}false{{end}}" onclick="switchTab('users')" style="background:none;border:none;padding:0;cursor:pointer;font:inherit;color:inherit">Benutzer</button></a>
+          <a onclick="switchTab('users')" style="cursor:pointer">Benutzer</a>
         </li>
       </ul>
     </div>
-    <script>
-    function switchTab(name) {
-      document.querySelectorAll('.tab-panel').forEach(function(p) { p.classList.remove('is-active'); });
-      document.querySelectorAll('.tabs li').forEach(function(li) {
-        li.classList.remove('is-active');
-        var btn = li.querySelector('[role="tab"]');
-        if (btn) btn.setAttribute('aria-selected', 'false');
-      });
-      document.getElementById('panel-' + name).classList.add('is-active');
-      var tabLi = document.getElementById('tab-' + name);
-      tabLi.classList.add('is-active');
-      var activeBtn = tabLi.querySelector('[role="tab"]');
-      if (activeBtn) activeBtn.setAttribute('aria-selected', 'true');
-      var url = new URL(window.location.href);
-      url.searchParams.set('tab', name);
-      history.replaceState(null, '', url.toString());
-    }
-    document.addEventListener('DOMContentLoaded', function() {
-      var active = '{{.ActiveTab}}';
-      switchTab(active || 'screens');
-    });
-    </script>
+  </div>
+</section>
 
-    <!-- Panel: Bildschirme -->
-    <div id="panel-screens" class="tab-panel box" style="border-radius:0 4px 4px 4px">
+<section class="section pt-3">
+  <div class="container">
 
-      <h2 class="title is-5">Bildschirme</h2>
-      {{if .Screens}}
-      <div style="overflow-x: auto">
-      <table class="table is-fullwidth is-hoverable is-striped">
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Slug</th>
-            <th>Format</th>
-            <th>Status</th>
-            <th>Benutzer</th>
-            <th>Aktionen</th>
-          </tr>
-        </thead>
-        <tbody>
+    <!-- Panel: Screens -->
+    <div id="panel-screens" class="tab-panel{{if eq .ActiveTab "screens"}} is-active{{end}}">
+
+      <div class="box mb-4">
+        <div style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:.75rem;margin-bottom:1.25rem">
+          <h2 class="title is-5 mb-0">Bildschirme</h2>
+          <div class="buttons mb-0">
+            <a class="button is-primary is-small" href="#add-screen">+ Neuer Bildschirm</a>
+          </div>
+        </div>
+
+        {{if .Screens}}
+        <div class="columns is-multiline">
           {{range .Screens}}
           {{$users := index $.ScreenUserMap .ID}}
-          <tr>
-            <td><strong>{{.Name}}</strong></td>
-            <td><code>{{.Slug}}</code></td>
-            <td>{{orientationLabel .Orientation}}</td>
-            <td id="status-{{.Slug}}"><span class="has-text-grey" aria-label="Status unbekannt">⚪</span></td>
-            <td>
-              {{$screenID := .ID}}
-              {{$screenName := .Name}}
-              <button class="button is-small is-light"
-                type="button"
-                data-screen-id="{{$screenID}}"
-                data-screen-name="{{$screenName}}"
-                onclick="openScreenUsersModal('{{$screenID}}', {{$screenName | printf "%q"}}, buildScreenUsersHTML('{{$screenID}}', {{$screenName | printf "%q"}}))">
-                {{len $users}} Benutzer
-              </button>
-            </td>
-            <td>
-              <a class="button is-small is-link" href="/manage/{{.Slug}}">Playlist verwalten</a>
-              &nbsp;
-              <button class="button is-small is-danger is-outlined"
-                      type="button"
-                      aria-label="Bildschirm {{.Name}} löschen"
-                      onclick="openDeleteModal('/admin/screens/{{.ID}}/delete', '{{.Name}}')">Löschen</button>
-            </td>
-          </tr>
+          <div class="column is-4-desktop is-6-tablet">
+            <div class="screen-card">
+              <div class="screen-card-name">
+                {{if eq .Orientation "portrait"}}📱{{else}}🖥{{end}}
+                {{.Name}}
+              </div>
+              <div class="screen-card-slug">{{.Slug}}</div>
+              <div class="screen-card-meta">
+                <span class="orient-badge">{{orientationLabel .Orientation}}</span>
+                <span id="status-{{.Slug}}" class="status-dot unknown" title="Unbekannt"></span>
+                <button class="button is-small is-light" type="button"
+                  data-screen-id="{{.ID}}" data-screen-name="{{.Name}}"
+                  onclick="openScreenUsersModal('{{.ID}}', {{.Name | printf "%q"}}, buildScreenUsersHTML('{{.ID}}', {{.Name | printf "%q"}}))">
+                  {{len $users}} Benutzer
+                </button>
+              </div>
+              <div class="screen-card-actions">
+                <a class="button is-small is-primary is-fullwidth" href="/manage/{{.Slug}}">Playlist</a>
+                <button class="button is-small is-danger is-outlined" type="button"
+                  onclick="openDelModal('/admin/screens/{{.ID}}/delete','{{.Name}}')">Löschen</button>
+              </div>
+            </div>
+          </div>
           {{end}}
-        </tbody>
-      </table>
+        </div>
+        {{else}}
+        <div class="notification is-light">Noch keine Bildschirme angelegt.</div>
+        {{end}}
       </div>
-      {{else}}
-      <div class="notification is-light">Noch keine Bildschirme angelegt. Füge unten den ersten hinzu.</div>
-      {{end}}
 
-      <hr>
-
-      <h2 class="title is-5">Neuen Bildschirm einrichten</h2>
-      <p class="mb-4 has-text-grey">
-        Fülle die Angaben aus. Der Bildschirm wird im Backend angelegt und du erhältst
-        eine <strong>Schritt-für-Schritt-Anleitung</strong> mit allen nötigen Befehlen
-        für das Ansible-Deployment.
-      </p>
-      <form method="POST" action="/admin/screens/provision">
-        <div class="columns is-multiline">
-          <div class="column is-3">
-            <div class="field">
-              <label class="label">Slug / Hostname</label>
-              <div class="control">
-                <input class="input" type="text" name="slug" placeholder="z.B. info12" required
-                       pattern="[a-z0-9-]+" title="Nur Kleinbuchstaben, Zahlen und Bindestriche">
-              </div>
-              <p class="help">Eindeutig, URL-sicher — wird als <code>screen_id</code> verwendet</p>
-            </div>
-          </div>
-          <div class="column is-3">
-            <div class="field">
-              <label class="label">Anzeigename</label>
-              <div class="control">
-                <input class="input" type="text" name="name" placeholder="z.B. Kantine EG" required>
+      <!-- Add screen form -->
+      <div class="box" id="add-screen">
+        <h2 class="title is-5 mb-1">Neuen Bildschirm einrichten</h2>
+        <p class="has-text-grey mb-4" style="font-size:.875rem">Bildschirm anlegen und Ansible-Deployment-Anleitung generieren.</p>
+        <form method="POST" action="/admin/screens/provision">
+          <div class="columns is-multiline">
+            <div class="column is-3">
+              <div class="field">
+                <label class="label is-small">Slug / Hostname</label>
+                <input class="input is-small" type="text" name="slug" placeholder="z.B. info12" required pattern="[a-z0-9-]+" title="Kleinbuchstaben, Zahlen, Bindestriche">
+                <p class="help">Als <code>screen_id</code> verwendet</p>
               </div>
             </div>
-          </div>
-          <div class="column is-2">
-            <div class="field">
-              <label class="label">IP-Adresse</label>
-              <div class="control">
-                <input class="input" type="text" name="ip" placeholder="10.0.0.X" required>
+            <div class="column is-3">
+              <div class="field">
+                <label class="label is-small">Anzeigename</label>
+                <input class="input is-small" type="text" name="name" placeholder="z.B. Kantine EG" required>
               </div>
             </div>
-          </div>
-          <div class="column is-2">
-            <div class="field">
-              <label class="label">SSH-User</label>
-              <div class="control">
-                <input class="input" type="text" name="ssh_user" placeholder="morz" value="morz">
+            <div class="column is-2">
+              <div class="field">
+                <label class="label is-small">IP-Adresse</label>
+                <input class="input is-small" type="text" name="ip" placeholder="10.0.0.X" required>
               </div>
             </div>
-          </div>
-          <div class="column is-2">
-            <div class="field">
-              <label class="label">Format</label>
-              <div class="control">
-                <div class="select is-fullwidth">
+            <div class="column is-2">
+              <div class="field">
+                <label class="label is-small">SSH-User</label>
+                <input class="input is-small" type="text" name="ssh_user" placeholder="morz" value="morz">
+              </div>
+            </div>
+            <div class="column is-2">
+              <div class="field">
+                <label class="label is-small">Format</label>
+                <div class="select is-small is-fullwidth">
                   <select name="orientation">
                     <option value="landscape">Querformat</option>
                     <option value="portrait">Hochformat</option>
@@ -536,37 +435,29 @@ document.addEventListener('keydown', function(e) {
               </div>
             </div>
           </div>
-        </div>
-        <button class="button is-primary" type="submit">Anlegen &amp; Anleitung generieren →</button>
-      </form>
+          <button class="button is-primary is-small" type="submit">Anlegen &amp; Anleitung generieren →</button>
+        </form>
 
-      <details class="mt-4">
-        <summary style="cursor:pointer;font-weight:600;color:#4a4a4a">Bildschirm nur anlegen (ohne Deployment)</summary>
-        <p class="help has-text-grey mt-1 mb-0">Legt nur einen Datenbank-Eintrag an — kein Ansible, kein Agent-Setup. Für Bildschirme, die bereits provisioniert sind oder manuell konfiguriert werden.</p>
-        <form method="POST" action="/admin/screens" class="mt-4">
-          <div class="columns is-vcentered">
-            <div class="column is-3">
-              <div class="field">
-                <label class="label">Slug</label>
-                <div class="control">
-                  <input class="input" type="text" name="slug" placeholder="z.B. flur-eg" required
-                         pattern="[a-z0-9-]+" title="Nur Kleinbuchstaben, Zahlen und Bindestriche">
+        <details class="mt-4">
+          <summary class="has-text-grey is-size-7" style="cursor:pointer">Nur anlegen (ohne Deployment)</summary>
+          <form method="POST" action="/admin/screens" class="mt-3">
+            <div class="columns is-vcentered">
+              <div class="column is-3">
+                <div class="field">
+                  <label class="label is-small">Slug</label>
+                  <input class="input is-small" type="text" name="slug" placeholder="flur-eg" required pattern="[a-z0-9-]+">
                 </div>
               </div>
-            </div>
-            <div class="column is-4">
-              <div class="field">
-                <label class="label">Name</label>
-                <div class="control">
-                  <input class="input" type="text" name="name" placeholder="z.B. Flur Erdgeschoss" required>
+              <div class="column is-4">
+                <div class="field">
+                  <label class="label is-small">Name</label>
+                  <input class="input is-small" type="text" name="name" placeholder="Flur Erdgeschoss" required>
                 </div>
               </div>
-            </div>
-            <div class="column is-2">
-              <div class="field">
-                <label class="label">Format</label>
-                <div class="control">
-                  <div class="select is-fullwidth">
+              <div class="column is-2">
+                <div class="field">
+                  <label class="label is-small">Format</label>
+                  <div class="select is-small is-fullwidth">
                     <select name="orientation">
                       <option value="landscape">Querformat</option>
                       <option value="portrait">Hochformat</option>
@@ -574,132 +465,144 @@ document.addEventListener('keydown', function(e) {
                   </div>
                 </div>
               </div>
+              <div class="column is-3">
+                <div class="field">
+                  <label class="label is-small">&nbsp;</label>
+                  <button class="button is-outlined is-small is-fullwidth" type="submit">Nur anlegen</button>
+                </div>
+              </div>
             </div>
-            <div class="column is-3">
+          </form>
+        </details>
+      </div>
+    </div><!-- /panel-screens -->
+
+    <!-- Panel: Users -->
+    <div id="panel-users" class="tab-panel{{if eq .ActiveTab "users"}} is-active{{end}}">
+      <div class="box">
+        <div style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:.75rem;margin-bottom:1.25rem">
+          <div>
+            <h2 class="title is-5 mb-0">Screen-Benutzer</h2>
+            <p class="has-text-grey mt-1" style="font-size:.875rem">Können sich einloggen und nur ihre zugeordneten Bildschirme verwalten.</p>
+          </div>
+        </div>
+
+        {{if .ScreenUsers}}
+        <div style="overflow-x:auto;margin-bottom:1.5rem">
+        <table class="table is-fullwidth is-hoverable">
+          <thead>
+            <tr style="font-size:.8rem;text-transform:uppercase;letter-spacing:.04em;color:#6b7280">
+              <th>Benutzername</th>
+              <th>Erstellt</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            {{range .ScreenUsers}}
+            <tr>
+              <td><strong>{{.Username}}</strong></td>
+              <td class="has-text-grey" style="font-size:.875rem">{{.CreatedAt.Format "02.01.2006 15:04"}}</td>
+              <td style="text-align:right">
+                <button class="button is-small is-danger is-outlined" type="button"
+                  onclick="openDelUserModal('/admin/users/{{.ID}}/delete','{{.Username}}')">Löschen</button>
+              </td>
+            </tr>
+            {{end}}
+          </tbody>
+        </table>
+        </div>
+        {{else}}
+        <div class="notification is-light mb-4">Noch keine Benutzer angelegt.</div>
+        {{end}}
+
+        <hr>
+        <h3 class="title is-6 mb-3">Neuen Benutzer anlegen</h3>
+        <form method="POST" action="/admin/users">
+          <div class="columns is-vcentered">
+            <div class="column is-4">
               <div class="field">
-                <label class="label">&nbsp;</label>
-                <button class="button is-outlined is-fullwidth" type="submit">Nur anlegen</button>
+                <label class="label is-small">Benutzername</label>
+                <input class="input is-small" type="text" name="username" placeholder="z.B. alice" required autocomplete="off">
+              </div>
+            </div>
+            <div class="column is-4">
+              <div class="field">
+                <label class="label is-small">Passwort</label>
+                <div class="control has-icons-right">
+                  <input class="input is-small" type="password" id="admin-new-password" name="password" placeholder="Mindestens 8 Zeichen" required autocomplete="new-password" minlength="8">
+                  <span class="icon is-small is-right" style="pointer-events:all;cursor:pointer" onclick="var i=document.getElementById('admin-new-password');i.type=i.type==='password'?'text':'password'">
+                    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg>
+                  </span>
+                </div>
+                <p class="help">Mind. 8 Zeichen</p>
+              </div>
+            </div>
+            <div class="column is-4">
+              <div class="field">
+                <label class="label is-small">&nbsp;</label>
+                <button class="button is-primary is-small" type="submit">Benutzer anlegen</button>
               </div>
             </div>
           </div>
         </form>
-      </details>
-
-    </div><!-- /panel-screens -->
-
-    <!-- Panel: Benutzer -->
-    <div id="panel-users" class="tab-panel box" style="border-radius:0 4px 4px 4px">
-
-      <h2 class="title is-5">Screen-Benutzer</h2>
-      <p class="has-text-grey mb-4">Screen-Benutzer können sich einloggen und nur ihre zugeordneten Bildschirme verwalten.</p>
-
-      {{if .ScreenUsers}}
-      <table class="table is-fullwidth is-hoverable is-striped mb-5">
-        <thead>
-          <tr>
-            <th>Benutzername</th>
-            <th>Erstellt</th>
-            <th>Aktionen</th>
-          </tr>
-        </thead>
-        <tbody>
-          {{range .ScreenUsers}}
-          <tr>
-            <td><strong>{{.Username}}</strong></td>
-            <td>{{.CreatedAt.Format "02.01.2006 15:04"}}</td>
-            <td>
-              <button class="button is-small is-danger is-outlined"
-                      type="button"
-                      onclick="openDeleteUserModal('/admin/users/{{.ID}}/delete', '{{.Username}}')">Löschen</button>
-            </td>
-          </tr>
-          {{end}}
-        </tbody>
-      </table>
-      {{else}}
-      <div class="notification is-light mb-4">Noch keine Screen-Benutzer angelegt. Lege unten den ersten an.</div>
-      {{end}}
-
-      <hr>
-      <h3 class="title is-6">Neuen Benutzer anlegen</h3>
-      <form method="POST" action="/admin/users">
-        <div class="columns is-vcentered">
-          <div class="column is-4">
-            <div class="field">
-              <label class="label">Benutzername</label>
-              <div class="control">
-                <input class="input" type="text" name="username" placeholder="z.B. alice" required
-                       autocomplete="off">
-              </div>
-            </div>
-          </div>
-          <div class="column is-4">
-            <div class="field">
-              <label class="label">Passwort</label>
-              <div class="control has-icons-right">
-                <input class="input" type="password" id="admin-new-password" name="password" placeholder="Passwort (mind. 8 Zeichen)" required
-                       autocomplete="new-password" minlength="8">
-                <span class="icon is-small is-right" style="pointer-events:all;cursor:pointer" onclick="togglePwAdmin()" title="Passwort anzeigen/verbergen" aria-label="Passwort anzeigen/verbergen">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"
-                       fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/>
-                    <circle cx="12" cy="12" r="3"/>
-                  </svg>
-                </span>
-              </div>
-              <p class="help">Mindestens 8 Zeichen</p>
-            </div>
-          </div>
-          <div class="column is-4">
-            <div class="field">
-              <label class="label">&nbsp;</label>
-              <button class="button is-primary" type="submit">Benutzer anlegen</button>
-            </div>
-          </div>
-        </div>
-      </form>
-
+      </div>
     </div><!-- /panel-users -->
 
   </div>
 </section>
 
-<!-- Eingebettete Screen-User-Daten für das Modal (als JSON-Strings) -->
 <script>
 var _screenUsers = {{.ScreenUsers | screenUsersJSON}};
 var _screenUserMap = {{.ScreenUserMap | screenUserMapJSON}};
 
+function escHtml(s) {
+  return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
+}
+
+function openDelModal(action, name) {
+  document.getElementById('del-form').action = action;
+  document.getElementById('del-name').textContent = name;
+  document.getElementById('del-modal').classList.add('is-active');
+}
+function openDelUserModal(action, name) {
+  document.getElementById('del-user-form').action = action;
+  document.getElementById('del-user-name').textContent = name;
+  document.getElementById('del-user-modal').classList.add('is-active');
+}
+function openScreenUsersModal(screenId, screenName, html) {
+  document.getElementById('su-modal-title').textContent = 'Benutzer: ' + screenName;
+  document.getElementById('su-modal-body').innerHTML = html;
+  document.getElementById('screen-users-modal').classList.add('is-active');
+  injectCSRF();
+}
+function closeModal(id) { document.getElementById(id).classList.remove('is-active'); }
+document.addEventListener('keydown', function(e) {
+  if (e.key === 'Escape') ['del-modal','del-user-modal','screen-users-modal'].forEach(function(id) { closeModal(id); });
+});
+
 function buildScreenUsersHTML(screenId, screenName) {
   var users = _screenUserMap[screenId] || [];
   var allUsers = _screenUsers || [];
-
-  // Bereits zugeordnete User-IDs
-  var assignedIds = {};
-  users.forEach(function(u) { assignedIds[u.id] = true; });
-
-  // Tabelle der zugeordneten User
+  var assigned = {};
+  users.forEach(function(u) { assigned[u.id] = true; });
   var html = '';
   if (users.length > 0) {
     html += '<table class="table is-fullwidth is-narrow mb-4"><thead><tr><th>Benutzer</th><th></th></tr></thead><tbody>';
     users.forEach(function(u) {
-      html += '<tr><td>' + escHtml(u.username) + '</td>';
-      html += '<td><form method="POST" action="/admin/screens/' + escHtml(screenId) + '/users/' + escHtml(u.id) + '/remove" style="display:inline">';
+      html += '<tr><td>' + escHtml(u.username) + '</td><td>';
+      html += '<form method="POST" action="/admin/screens/' + escHtml(screenId) + '/users/' + escHtml(u.id) + '/remove" style="display:inline">';
       html += '<button class="button is-small is-danger is-outlined" type="submit">Entfernen</button></form></td></tr>';
     });
     html += '</tbody></table>';
   } else {
     html += '<p class="has-text-grey mb-4">Noch keine Benutzer zugeordnet.</p>';
   }
-
-  // Dropdown mit verfügbaren Usern
-  var available = allUsers.filter(function(u) { return !assignedIds[u.id]; });
+  var available = allUsers.filter(function(u) { return !assigned[u.id]; });
   if (available.length > 0) {
     html += '<form method="POST" action="/admin/screens/' + escHtml(screenId) + '/users">';
     html += '<div class="field has-addons">';
     html += '<div class="control is-expanded"><div class="select is-fullwidth"><select name="user_id">';
-    available.forEach(function(u) {
-      html += '<option value="' + escHtml(u.id) + '">' + escHtml(u.username) + '</option>';
-    });
+    available.forEach(function(u) { html += '<option value="' + escHtml(u.id) + '">' + escHtml(u.username) + '</option>'; });
     html += '</select></div></div>';
     html += '<div class="control"><button class="button is-primary" type="submit">Hinzufügen</button></div>';
     html += '</div></form>';
@@ -708,111 +611,80 @@ function buildScreenUsersHTML(screenId, screenName) {
   } else {
     html += '<p class="help has-text-grey">Alle Benutzer sind bereits zugeordnet.</p>';
   }
-
   return html;
 }
 
-function escHtml(s) {
-  return String(s)
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;');
+function switchTab(name) {
+  document.querySelectorAll('.tab-panel').forEach(function(p) { p.classList.remove('is-active'); });
+  document.querySelectorAll('.tabs li').forEach(function(li) { li.classList.remove('is-active'); });
+  document.getElementById('panel-' + name).classList.add('is-active');
+  document.getElementById('tab-' + name).classList.add('is-active');
+  history.replaceState(null, '', '?tab=' + name);
 }
 
-function injectCSRFNow() {
-  function getCookie(name) {
-    var m = document.cookie.match('(?:^|; )' + name + '=([^;]*)');
-    return m ? decodeURIComponent(m[1]) : '';
+// Navbar burger
+(function() {
+  var b = document.querySelector('.navbar-burger');
+  if (b) b.addEventListener('click', function() {
+    b.classList.toggle('is-active');
+    document.getElementById(b.dataset.target).classList.toggle('is-active');
+  });
+})();
+
+// Toast from ?msg=
+(function() {
+  var msg = new URLSearchParams(window.location.search).get('msg');
+  if (!msg) return;
+  var texts = { uploaded:'✓ Medium hochgeladen.',deleted:'✓ Gelöscht.',saved:'✓ Gespeichert.',added:'✓ Hinzugefügt.',user_added:'✓ Benutzer angelegt.',user_deleted:'✓ Benutzer gelöscht.',user_added_to_screen:'✓ Benutzer zugeordnet.',user_removed_from_screen:'✓ Benutzer entfernt.',error_empty:'⚠ Felder ausfüllen.',error_exists:'⚠ Bereits vergeben.',error_db:'⚠ Datenbankfehler.' };
+  var isErr = msg.startsWith('error_');
+  showToast(texts[msg] || '✓ Aktion erfolgreich.', isErr ? 'is-warning' : 'is-success');
+  history.replaceState(null, '', window.location.pathname + (window.location.search.replace(/[?&]msg=[^&]*/,'') || ''));
+})();
+
+// Status dots
+(function() {
+  function update() {
+    fetch('/api/v1/screens/status').then(function(r) { return r.ok ? r.json() : null; }).then(function(data) {
+      if (!data || !data.screens) return;
+      data.screens.forEach(function(s) {
+        var el = document.getElementById('status-' + s.screen_id);
+        if (!el) return;
+        var state = s.derived_state || 'unknown';
+        el.className = 'status-dot ' + (state === 'online' ? 'online' : state === 'degraded' ? 'stale' : 'offline');
+        el.title = state;
+      });
+    }).catch(function(){});
   }
-  var token = getCookie('morz_csrf');
-  if (!token) return;
+  update(); setInterval(update, 30000);
+})();
+
+// Auto-open screen users modal from ?screen=
+document.addEventListener('DOMContentLoaded', function() {
+  var sc = new URLSearchParams(window.location.search).get('screen');
+  if (!sc) return;
+  var btn = document.querySelector('[data-screen-id="' + sc + '"]');
+  if (btn) openScreenUsersModal(sc, btn.getAttribute('data-screen-name') || sc, buildScreenUsersHTML(sc, btn.getAttribute('data-screen-name') || sc));
+  history.replaceState(null, '', window.location.href.replace(/[?&]screen=[^&]*/,''));
+});
+
+function showToast(msg, type) {
+  type = type || 'is-success';
+  var t = document.createElement('div');
+  t.className = 'morz-toast ' + type;
+  t.innerHTML = msg + '<button onclick="this.parentElement.remove()" style="background:none;border:none;cursor:pointer;font-size:1rem;margin-left:auto;opacity:.6">✕</button>';
+  document.body.appendChild(t);
+  requestAnimationFrame(function() { t.classList.add('show'); });
+  setTimeout(function() { t.classList.remove('show'); setTimeout(function() { t.remove(); }, 300); }, 3500);
+}
+
+function getCsrfToken() { var m = document.cookie.match('(?:^|; )morz_csrf=([^;]*)'); return m ? decodeURIComponent(m[1]) : ''; }
+function injectCSRF() {
+  var token = getCsrfToken(); if (!token) return;
   document.querySelectorAll('form[method="POST"],form[method="post"]').forEach(function(f) {
-    if (!f.querySelector('input[name="csrf_token"]')) {
-      var inp = document.createElement('input');
-      inp.type = 'hidden'; inp.name = 'csrf_token'; inp.value = token;
-      f.appendChild(inp);
-    }
+    if (!f.querySelector('input[name="csrf_token"]')) { var i=document.createElement('input');i.type='hidden';i.name='csrf_token';i.value=token;f.appendChild(i); }
   });
 }
-</script>
-
-<script>
-(function() {
-  fetch('/api/v1/screens/status')
-    .then(function(r) { return r.ok ? r.json() : null; })
-    .then(function(data) {
-      if (!data || !data.screens) return;
-      var dots = {
-        'online':   { emoji: '🟢', label: 'Online' },
-        'degraded': { emoji: '🟡', label: 'Eingeschränkt' },
-        'offline':  { emoji: '🔴', label: 'Offline' }
-      };
-      data.screens.forEach(function(s) {
-        var cell = document.getElementById('status-' + s.screen_id);
-        if (cell) {
-          var info = dots[s.derived_state] || { emoji: '⚪', label: 'Unbekannt' };
-          cell.innerHTML = '<span aria-hidden="true">' + info.emoji + '</span>'
-            + '<span class="is-sr-only">' + info.label + '</span>'
-            + ' <small>' + s.derived_state + '</small>';
-        }
-      });
-    })
-    .catch(function() {});
-})();
-</script>
-<script>
-// K1: CSRF Double-Submit — füge Token aus Cookie in alle POST-Formulare ein.
-(function() {
-  function getCookie(name) {
-    var m = document.cookie.match('(?:^|; )' + name + '=([^;]*)');
-    return m ? decodeURIComponent(m[1]) : '';
-  }
-  function injectCSRF() {
-    var token = getCookie('morz_csrf');
-    if (!token) return;
-    document.querySelectorAll('form[method="POST"],form[method="post"]').forEach(function(f) {
-      if (!f.querySelector('input[name="csrf_token"]')) {
-        var inp = document.createElement('input');
-        inp.type = 'hidden'; inp.name = 'csrf_token'; inp.value = token;
-        f.appendChild(inp);
-      }
-    });
-  }
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', injectCSRF);
-  } else {
-    injectCSRF();
-  }
-})();
-</script>
-<script>
-function togglePwAdmin() {
-  var inp = document.getElementById('admin-new-password');
-  if (inp) inp.type = (inp.type === 'password') ? 'text' : 'password';
-}
-</script>
-<script>
-// M2: Auto-open Screen-User-Modal wenn ?screen= in URL vorhanden
-document.addEventListener('DOMContentLoaded', function() {
-  var autoScreen = new URLSearchParams(window.location.search).get('screen');
-  if (!autoScreen) return;
-  // Suche den passenden Screen in den eingebetteten Daten
-  var allScreenData = document.querySelectorAll('[data-screen-id]');
-  // Fallback: direkt openScreenUsersModal aufrufen falls screenId bekannt
-  if (typeof openScreenUsersModal === 'function' && typeof buildScreenUsersHTML === 'function') {
-    // Finde Screenname aus dem Button
-    var btn = document.querySelector('[data-screen-id="' + autoScreen + '"]');
-    if (btn) {
-      var screenName = btn.getAttribute('data-screen-name') || autoScreen;
-      openScreenUsersModal(autoScreen, screenName, buildScreenUsersHTML(autoScreen, screenName));
-    }
-  }
-  // URL-Parameter entfernen ohne Reload
-  var url = new URL(window.location.href);
-  url.searchParams.delete('screen');
-  history.replaceState(null, '', url.toString());
-});
+if (document.readyState==='loading') document.addEventListener('DOMContentLoaded',injectCSRF); else injectCSRF();
 </script>
 </body>
 </html>`
