diff --git a/booth_settings.json b/booth_settings.json
new file mode 100644
index 0000000..5915e10
--- /dev/null
+++ b/booth_settings.json
@@ -0,0 +1,7 @@
+{
+  "artist": "Trollgorithm",
+  "album": null,
+  "year": null,
+  "genre": null,
+  "comment": null
+}
\ No newline at end of file
diff --git a/templates/admin/settings.html b/templates/admin/settings.html
index 0122539..ddc68cd 100644
--- a/templates/admin/settings.html
+++ b/templates/admin/settings.html
@@ -7,239 +7,259 @@
   <style>
     /*
       Admin settings / maintenance page.
-      Shows database health, statistics, upload disk usage,
-      and houses the dangerous system reset button.
+      Two-column layout for settings; table-styled MP3 metadata fields.
     */
+    :root{
+      --bg:#0b0f19;
+      --panel:#111827;
+      --text:#f3f4f6;
+      --muted:#9ca3af;
+      --accent:#60a5fa;
+      --accent-dark:#2563eb;
+      --danger:#dc2626;
+      --danger-dark:#991b1b;
+      --success:#10b981;
+      --warning:#f59e0b;
+      --border:#374151;
+    }
+    *{box-sizing:border-box;}
     body{
-      font-family:system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;
-      background:#111827;
-      color:#f3f4f6;
       margin:0;
-      padding:1rem;
+      font-family:system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,sans-serif;
+      background:var(--bg);
+      color:var(--text);
       line-height:1.5;
     }
-    .container{max-width:900px;margin:0 auto;}
-    h1,h2{color:#60a5fa;}
-    a{color:#93c5fd;text-decoration:none;}
+    .container{max-width:1200px;margin:0 auto;padding:1.5rem;}
     .topbar{
-      float:right;
       display:flex;
-      gap:.75rem;
+      justify-content:space-between;
       align-items:center;
+      margin-bottom:1.5rem;
     }
-    .topbar a{
-      color:#f87171;
+    h1{margin:0;font-size:1.5rem;}
+    .nav a{
+      color:var(--accent);
+      text-decoration:none;
+      margin-left:1rem;
     }
-    .section{
-      background:#1f2937;
-      padding:1rem;
+    .messages p{
+      padding:.75rem 1rem;
       border-radius:.5rem;
-      margin-bottom:1rem;
+      margin:0 0 1rem;
     }
-    .flash{
-      padding:.8rem;
-      background:#064e3b;
-      border-radius:.5rem;
-      margin-bottom:1rem;
-    }
-    .flash.error{background:#450a0a;}
-    .stat-grid{
+    .messages .success{background:#064e3b;color:#a7f3d0;}
+    .messages .error{background:#450a0a;color:#fca5a5;}
+
+    /* Two-column grid for settings */
+    .grid{
       display:grid;
-      grid-template-columns:repeat(auto-fit,minmax(220px,1fr));
-      gap:1rem;
+      grid-template-columns:repeat(2, 1fr);
+      gap:1.5rem;
     }
-    .stat-card{
-      background:#111827;
-      padding:.8rem;
-      border-radius:.5rem;
+    @media (max-width:900px){
+      .grid{grid-template-columns:1fr;}
     }
-    .stat-card .value{
-      font-size:1.5rem;
-      font-weight:700;
-      color:#60a5fa;
+
+    .section{
+      background:var(--panel);
+      border:1px solid var(--border);
+      border-radius:.75rem;
+      padding:1.25rem;
     }
-    .stat-card .label{
-      font-size:.85rem;
-      color:#9ca3af;
+    .section h2{
+      margin-top:0;
+      font-size:1.15rem;
+      color:var(--accent);
     }
-    .health-ok{
-      color:#10b981;
-      font-weight:700;
+    .section p{
+      margin:.5rem 0;
+      color:var(--muted);
+      font-size:.95rem;
     }
-    .health-bad{
-      color:#f87171;
-      font-weight:700;
+    label{
+      display:block;
+      margin-top:.75rem;
+      font-size:.9rem;
+      color:var(--muted);
     }
-    .status-list{
-      margin:0;
-      padding-left:1.2rem;
-    }
-    .status-list li{
-      margin-bottom:.3rem;
+    input[type="text"],input[type="number"],textarea,select{
+      width:100%;
+      padding:.6rem;
+      border-radius:.4rem;
+      border:1px solid var(--border);
+      background:#1f2937;
+      color:var(--text);
+      font:inherit;
+      margin-top:.25rem;
     }
+    textarea{resize:vertical;}
     button{
-      padding:.7rem 1rem;
+      margin-top:1rem;
+      padding:.65rem 1.2rem;
+      background:var(--accent-dark);
+      color:#fff;
       border:none;
       border-radius:.5rem;
-      background:#3b82f6;
-      color:#fff;
-      font-weight:700;
       cursor:pointer;
-      margin-right:.5rem;
+      font-weight:600;
     }
-    button.fix{
-      background:#10b981;
+    button:hover{background:var(--accent);}
+
+    /* Metadata table */
+    .meta-table{
+      width:100%;
+      border-collapse:collapse;
+      margin-top:.5rem;
     }
-    button.danger{
-      background:#dc2626;
+    .meta-table td{
+      padding:.5rem;
+      vertical-align:top;
+      border-bottom:1px solid var(--border);
     }
-    .danger-zone{
-      background:#450a0a;
-      border:1px solid #7f1d1d;
-      border-radius:.5rem;
-      padding:1rem;
+    .meta-table td:first-child{
+      width:30%;
+      font-size:.9rem;
+      color:var(--muted);
+      padding-left:0;
     }
-    .danger-zone h2{
-      color:#f87171;
+    .meta-table td:last-child{padding-right:0;}
+    .meta-table tr:last-child td{border-bottom:none;}
+    .meta-table input,.meta-table textarea{
       margin-top:0;
     }
-    .path{
-      font-family:ui-monospace,SFMono-Regular,Menlo,monospace;
-      font-size:.85rem;
-      word-break:break-all;
-      color:#9ca3af;
+
+    .danger-zone{
+      grid-column:1 / -1;
+      background:#450a0a;
+      border:1px solid #7f1d1d;
+      border-radius:.75rem;
+      padding:1.25rem;
     }
+    .danger-zone h2{margin-top:0;color:#fca5a5;}
+    .danger-zone button{
+      background:var(--danger);
+    }
+    .danger-zone button:hover{background:var(--danger-dark);}
+
+    .status-ok{color:var(--success);font-weight:600;}
+    .status-bad{color:var(--warning);font-weight:600;}
+    .copy-hint{font-size:.85rem;color:var(--muted);margin-top:.25rem;}
+    .path{word-break:break-all;font-family:monospace;font-size:.85rem;}
   </style>
 </head>
 <body>
   <div class="container">
     <div class="topbar">
-      <a href="{{ url_for('admin_dashboard') }}">Dashboard →</a>
-      <a href="{{ url_for('admin_logout') }}">Log out</a>
+      <h1>Admin Settings</h1>
+      <div class="nav">
+        <a href="{{ url_for('admin_dashboard') }}">← Back to Dashboard</a>
+        <a href="{{ url_for('admin_logout') }}">Log out</a>
+      </div>
     </div>
 
-    <h1>Admin Settings</h1>
-
     {% with messages = get_flashed_messages(with_categories=true) %}
-    {% for category, message in messages %}
-    <div class="flash {{ category }}">{{ message }}</div>
-    {% endfor %}
+    {% if messages %}
+    <div class="messages">
+      {% for category, message in messages %}
+      <p class="{{ category }}">{{ message }}</p>
+      {% endfor %}
+    </div>
+    {% endif %}
     {% endwith %}
 
-    <!-- Database health -->
-    <div class="section">
-      <h2>Database Health</h2>
-      {% if health.ok %}
-      <p class="health-ok">✅ {{ health.message }}</p>
-      {% else %}
-      <p class="health-bad">❌ {{ health.message }}</p>
-      {% if health.missing_columns %}
-      <p>Missing columns:</p>
-      <ul class="status-list">
-        {% for col in health.missing_columns %}
-        <li>{{ col }}</li>
-        {% endfor %}
-      </ul>
-      <form method="POST" style="margin-top:.8rem">
-        <input type="hidden" name="action" value="fix_db">
-        <button type="submit" class="fix">Fix Missing Columns</button>
-      </form>
-      {% endif %}
-      {% endif %}
-      <p class="path">DB path: {{ db_path }}</p>
-    </div>
+    <div class="grid">
 
-    <!-- Statistics -->
-    <div class="section">
-      <h2>Database Statistics</h2>
-      <div class="stat-grid">
-        <div class="stat-card">
-          <div class="value">{{ total_records }}</div>
-          <div class="label">Total requests</div>
-        </div>
-        <div class="stat-card">
-          <div class="value">{{ db_size }}</div>
-          <div class="label">Database size</div>
-        </div>
-        <div class="stat-card">
-          <div class="value">{{ upload_file_count }}</div>
-          <div class="label">Uploaded MP3 files</div>
-        </div>
-        <div class="stat-card">
-          <div class="value">{{ upload_dir_count }}</div>
-          <div class="label">Request upload folders</div>
-        </div>
-        <div class="stat-card">
-          <div class="value">{{ upload_size }}</div>
-          <div class="label">Total upload size</div>
-        </div>
+      <!-- Database health check -->
+      <div class="section">
+        <h2>Database Health</h2>
+        {% if health.ok %}
+        <p class="status-ok">✅ {{ health.message }}</p>
+        {% else %}
+        <p class="status-bad">❌ {{ health.message }}</p>
+        {% if health.missing_columns %}
+        <p>Missing columns: {{ health.missing_columns | join(', ') }}</p>
+        <form method="POST" action="{{ url_for('admin_settings') }}">
+          <input type="hidden" name="action" value="fix_schema">
+          <button type="submit">Fix Missing Columns</button>
+        </form>
+        {% endif %}
+        {% endif %}
       </div>
 
-      {% if status_counts %}
-      <h3 style="margin-top:1.2rem;color:#93c5fd">By Status</h3>
-      <ul class="status-list">
-        {% for key,count in status_counts.items() %}
-        <li>{{ statuses[key] }} ({{ key }}): <strong>{{ count }}</strong></li>
-        {% endfor %}
-      </ul>
-      {% else %}
-      <p style="margin-top:1rem;color:#9ca3af">No requests yet.</p>
-      {% endif %}
-    </div>
+      <!-- Database statistics -->
+      <div class="section">
+        <h2>Database Statistics</h2>
+        <p><strong>Total requests:</strong> {{ total_records }}</p>
+        <p><strong>Database size:</strong> {{ db_size }}</p>
+        <p><strong>Uploaded MP3s:</strong> {{ upload_file_count }} files in {{ upload_dir_count }} request folders</p>
+        <p><strong>Uploads total size:</strong> {{ upload_size }}</p>
+        {% if status_counts %}
+        <p><strong>Status breakdown:</strong></p>
+        <ul>
+          {% for status, count in status_counts.items() %}
+          <li>{{ status }}: {{ count }}</li>
+          {% endfor %}
+        </ul>
+        {% endif %}
+        <p><strong>Database path:</strong><br><span class="path">{{ db_path }}</span></p>
+        <p><strong>Uploads path:</strong><br><span class="path">{{ upload_path }}</span></p>
+      </div>
 
-    <!-- Paths -->
-    <div class="section">
-      <h2>Paths</h2>
-      <p><strong>Database:</strong><br><span class="path">{{ db_path }}</span></p>
-      <p><strong>Uploads:</strong><br><span class="path">{{ upload_path }}</span></p>
-    </div>
+      <!-- Revision limit -->
+      <div class="section">
+        <h2>Revision Limit</h2>
+        <form method="POST">
+          <input type="hidden" name="action" value="save_max_revisions">
+          <label for="max_revisions">Maximum customer revisions allowed</label>
+          <input type="number" id="max_revisions" name="max_revisions" min="0" value="{{ current_max_revisions }}">
+          <p class="copy-hint">Set to 0 to disable customer-submitted revisions. Operators can still upload new versions manually.</p>
+          <button type="submit">Save Revision Limit</button>
+        </form>
+      </div>
 
-    <!-- Settings controls -->
-    <div class="section">
-      <h2>Booth Settings</h2>
-      <form method="POST">
-        <input type="hidden" name="action" value="save_max_revisions">
-        <label for="max_revisions">Maximum customer revisions allowed</label>
-        <input type="number" id="max_revisions" name="max_revisions" min="0" value="{{ current_max_revisions }}">
-        <p class="copy-hint">Set to 0 to disable customer-submitted revisions. Operators can still upload new versions manually.</p>
-        <button type="submit">Save Revision Limit</button>
-      </form>
-    </div>
+      <!-- MP3 metadata defaults -->
+      <div class="section">
+        <h2>MP3 Metadata Tags</h2>
+        <p class="copy-hint">These values are written into every uploaded MP3 file. The song title from the prompt is written to the Title tag automatically. Blank fields are skipped.</p>
+        <form method="POST">
+          <input type="hidden" name="action" value="save_metadata">
+          <table class="meta-table">
+            <tr>
+              <td>Artist</td>
+              <td><input type="text" id="artist" name="artist" value="{{ metadata.get('artist', '') }}" placeholder="e.g. Trollgorithm"></td>
+            </tr>
+            <tr>
+              <td>Album</td>
+              <td><input type="text" id="album" name="album" value="{{ metadata.get('album', '') }}" placeholder="e.g. Theme Song Booth 2026"></td>
+            </tr>
+            <tr>
+              <td>Year</td>
+              <td><input type="text" id="year" name="year" value="{{ metadata.get('year', '') }}" placeholder="e.g. 2026"></td>
+            </tr>
+            <tr>
+              <td>Genre</td>
+              <td><input type="text" id="genre" name="genre" value="{{ metadata.get('genre', '') }}" placeholder="e.g. Country Metal"></td>
+            </tr>
+            <tr>
+              <td>Comment</td>
+              <td><textarea id="comment" name="comment" rows="3" placeholder="e.g. Custom theme song generated at the booth">{{ metadata.get('comment', '') }}</textarea></td>
+            </tr>
+          </table>
+          <button type="submit">Save Metadata Defaults</button>
+        </form>
+      </div>
 
-    <!-- MP3 metadata defaults -->
-    <div class="section">
-      <h2>MP3 Metadata Tags</h2>
-      <p class="copy-hint">These values are written into every uploaded MP3 file. The song title from the prompt is written to the Title tag automatically.</p>
-      <form method="POST">
-        <input type="hidden" name="action" value="save_metadata">
+      <!-- System reset spans both columns -->
+      <div class="danger-zone">
+        <h2>⚠️ Reset System</h2>
+        <p>Use this only at the start of a new event. It will delete every request and every uploaded MP3 file. This cannot be undone.</p>
+        <form method="POST" action="{{ url_for('admin_settings') }}" onsubmit="return confirm('ARE YOU SURE? This will delete ALL requests and ALL uploaded files. This cannot be undone.')">
+          <input type="hidden" name="action" value="reset_system">
+          <button type="submit">Reset System</button>
+        </form>
+      </div>
 
-        <label for="artist">Artist</label>
-        <input type="text" id="artist" name="artist" value="{{ metadata.get('artist', '') }}" placeholder="e.g. Trollgorithm">
-
-        <label for="album">Album</label>
-        <input type="text" id="album" name="album" value="{{ metadata.get('album', '') }}" placeholder="e.g. Theme Song Booth 2026">
-
-        <label for="year">Year</label>
-        <input type="text" id="year" name="year" value="{{ metadata.get('year', '') }}" placeholder="e.g. 2026">
-
-        <label for="genre">Genre</label>
-        <input type="text" id="genre" name="genre" value="{{ metadata.get('genre', '') }}" placeholder="e.g. Country Metal">
-
-        <label for="comment">Comment</label>
-        <textarea id="comment" name="comment" rows="3" placeholder="e.g. Custom theme song generated at the booth">{{ metadata.get('comment', '') }}</textarea>
-
-        <button type="submit">Save Metadata Defaults</button>
-      </form>
-    </div>
-
-    <!-- System reset -->
-    <div class="danger-zone">
-      <h2>⚠️ Reset System</h2>
-      <p>Use this only at the start of a new event. It will delete every request and every uploaded MP3 file. This cannot be undone.</p>
-      <form method="POST" action="{{ url_for('admin_settings') }}" onsubmit="return confirm('ARE YOU SURE? This will delete ALL requests and ALL uploaded files. This cannot be undone.')">
-        <input type="hidden" name="action" value="reset_system">
-        <button type="submit" class="danger">Reset System</button>
-      </form>
     </div>
   </div>
 </body>