diff --git a/admin.html b/admin.html
index 13ced18..2a061e8 100644
--- a/admin.html
+++ b/admin.html
@@ -38,13 +38,7 @@
             <div class="admin-panel-head">
                 <div>
                     <p class="section-kicker">Konfiguration</p>
-                    <h2>Dienste & Kategorien</h2>
-                </div>
-                <div class="admin-actions compact">
-                    <button class="ghost-button" id="checkAllButton" type="button">Status pruefen</button>
-                    <button class="ghost-button" id="saveLocalButton" type="button">Lokal speichern</button>
-                    <button class="ghost-button" id="resetLocalButton" type="button">Lokale Aenderungen verwerfen</button>
-                    <button class="ghost-button" id="downloadConfigButton" type="button">JSON exportieren</button>
+                    <h2>System-Administration</h2>
                 </div>
             </div>
 
@@ -86,10 +80,22 @@
                     <div id="containerStatus" class="ops-list">Noch nicht geladen.</div>
                 </section>
             </div>
-            <div class="admin-table" id="serviceEditor"></div>
+
+            <section class="ops-card ops-card-wide is-collapsed" id="editorCard" style="margin-top: 14px;">
+                <div class="ops-card-head">
+                    <span>Dienste &amp; Kategorien (Konfiguration)</span>
+                </div>
+                <div class="admin-actions-bar">
+                    <button class="ghost-button mini" id="checkAllButton" type="button">Alle Status pruefen</button>
+                    <button class="ghost-button mini" id="saveLocalButton" type="button">Lokal speichern</button>
+                    <button class="ghost-button mini" id="resetLocalButton" type="button">Aenderungen verwerfen</button>
+                    <button class="ghost-button mini" id="downloadConfigButton" type="button">JSON exportieren</button>
+                </div>
+                <div class="admin-table" id="serviceEditor"></div>
+            </section>
         </section>
     </main>
 
-    <script src="/admin.js?v=16" defer></script>
+    <script src="/admin.js?v=17" defer></script>
 </body>
 </html>
diff --git a/admin.js b/admin.js
index 935980b..e5ab936 100644
--- a/admin.js
+++ b/admin.js
@@ -718,12 +718,19 @@ function initCollapsibleCards() {
     const card = head.closest('.ops-card');
     if (!card) return;
 
-    const bodyEl = card.querySelector('.services-status-board, .ops-list');
+    const bodyEl = card.querySelector('.services-status-board, .ops-list, .admin-table');
     const id = bodyEl ? bodyEl.id : null;
     const storageKey = id ? `ops-card-collapsed-${id}` : null;
 
     if (storageKey) {
-      const isCollapsed = localStorage.getItem(storageKey) === 'true';
+      let isCollapsed;
+      const stored = localStorage.getItem(storageKey);
+      if (stored === null) {
+        // Default to collapsed for the service editor, expanded for others
+        isCollapsed = (id === 'serviceEditor');
+      } else {
+        isCollapsed = (stored === 'true');
+      }
       card.classList.toggle('is-collapsed', isCollapsed);
     }
 
diff --git a/style.css b/style.css
index ae8e633..a131d6d 100644
--- a/style.css
+++ b/style.css
@@ -1035,4 +1035,19 @@ main {
     }
 }
 
+#editorCard {
+    max-width: 900px;
+    margin-inline: auto;
+}
+
+.admin-actions-bar {
+    display: flex;
+    gap: 8px;
+    flex-wrap: wrap;
+    margin-bottom: 14px;
+    border-bottom: 1px solid var(--border);
+    padding-bottom: 12px;
+    margin-top: 8px;
+}
+