diff --git a/wwwroot/css/dashboard.css b/wwwroot/css/dashboard.css
index c3f56bf..c8e4bd8 100644
--- a/wwwroot/css/dashboard.css
+++ b/wwwroot/css/dashboard.css
@@ -38,6 +38,10 @@
   margin-bottom: var(--box-spacing);
 }
 
+.section-header h2 {
+  font-size: calc(var(--font-size) * 1.3);
+}
+
 .card-grid {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(22em, 1fr));
@@ -139,20 +143,8 @@
   color: var(--secondary);
 }
 
-#newAgentCard,
-#newSessionCard {
-  margin-top: var(--box-spacing);
-}
-
-#newAgentCard .card,
-#newSessionCard .card {
-  align-items: center;
-  justify-content: center;
-}
-
-#newAgentCard .card-body,
-#newSessionCard .card-body {
-  padding: var(--button-padding);
+.section-add-btn {
+  font-size: var(--font-size);
 }
 
 /* Card Menu */
diff --git a/wwwroot/css/form.css b/wwwroot/css/form.css
index e757785..11c4140 100644
--- a/wwwroot/css/form.css
+++ b/wwwroot/css/form.css
@@ -2,7 +2,7 @@
   padding: var(--page-padding);
   display: flex;
   flex-direction: column;
-  gap: var(--box-spacing);
+  gap: var(--badge-spacing);
   width: 100%;
 }
 
@@ -103,12 +103,12 @@
 
 /* ── Checkbox ── */
 
-.checkbox-label {
+label.checkbox-label {
   display: flex;
   align-items: center;
   gap: var(--badge-spacing);
   cursor: pointer;
-  margin-top: var(--box-spacing);
+  margin-top: var(--badge-spacing);
 }
 
 .checkbox-label input[type="checkbox"] {
@@ -131,7 +131,7 @@
   gap: var(--badge-spacing);
 }
 
-.skill-item {
+label.skill-item {
   display: flex;
   align-items: center;
   gap: var(--badge-spacing);
diff --git a/wwwroot/index.html b/wwwroot/index.html
index 52e1c6b..13b13e8 100644
--- a/wwwroot/index.html
+++ b/wwwroot/index.html
@@ -57,16 +57,16 @@
       <section>
         <div class="section-header">
           <h2>Sessions</h2>
+          <button id="newSessionBtn" class="section-add-btn"><i class="fa fa-plus"></i> Neue Session</button>
         </div>
         <div class="card-grid" id="sessionCards"></div>
-        <div class="card-grid" id="newSessionCard"></div>
       </section>
       <section>
         <div class="section-header">
           <h2>Agents</h2>
+          <button id="newAgentBtn" class="section-add-btn"><i class="fa fa-plus"></i> Neuer Agent</button>
         </div>
         <div class="card-grid" id="agentCards"></div>
-        <div class="card-grid" id="newAgentCard"></div>
       </section>
     </div>
   </div>
@@ -146,6 +146,7 @@
           <option value="enforce">Erzwingen (nach jeder Änderung)</option>
           <option value="forbid">Verbieten (strikt verboten)</option>
         </select>
+        <label>Ego</label>
         <label class="checkbox-label">
           <input type="checkbox" id="agentUseSoul" checked>
           Hat eine Seele <span class="checkbox-hint">(SOUL.md im System-Prompt)</span>
@@ -160,10 +161,10 @@
         </label>
         <label class="checkbox-label">
           <input type="checkbox" id="agentUseMemory" checked>
-          Auf Erinnerungen zugreifen <span class="checkbox-hint">(Memory-Tools verfügbar)</span>
+          Zugriff auf Erinnerungen <span class="checkbox-hint">(Memory-Tools verfügbar)</span>
         </label>
+        <label>Skills</label>
         <div id="agentSkillsSection" hidden>
-          <label>Skills</label>
           <div class="skill-list" id="agentSkillList"></div>
         </div>
         <label>Benutzerdefinierte Befehle</label>
diff --git a/wwwroot/js/pages/dashboard.js b/wwwroot/js/pages/dashboard.js
index 7bdce54..70f0e3c 100644
--- a/wwwroot/js/pages/dashboard.js
+++ b/wwwroot/js/pages/dashboard.js
@@ -126,12 +126,8 @@ registerPage('dashboard', {
       }
     }
 
-    // Neue Session Placeholder
-    const newSession = document.createElement('div');
-    newSession.className = 'card placeholder clickable';
-    newSession.innerHTML = '<div class="card-body"><div class="card-title">+ Neue Session</div></div>';
-    newSession.addEventListener('click', () => navigateTo('session'));
-    document.getElementById('newSessionCard').appendChild(newSession);
+    // Neue Session Button
+    document.getElementById('newSessionBtn').addEventListener('click', () => navigateTo('session'));
 
     // Agents
     const agentGrid = document.getElementById('agentCards');
@@ -199,11 +195,8 @@ registerPage('dashboard', {
       agentGrid.appendChild(card);
     }
 
-    const placeholder = document.createElement('div');
-    placeholder.className = 'card placeholder clickable';
-    placeholder.innerHTML = '<div class="card-body"><div class="card-title">+ Neuer Agent</div></div>';
-    placeholder.addEventListener('click', () => navigateTo('agent'));
-    document.getElementById('newAgentCard').appendChild(placeholder);
+    // Neuer Agent Button
+    document.getElementById('newAgentBtn').addEventListener('click', () => navigateTo('agent'));
   },
   destroy() {
     if (this._closeCardMenus) {