diff --git a/spine.el b/spine.el
index bb14206..9d24bf7 100644
--- a/spine.el
+++ b/spine.el
@@ -407,7 +407,7 @@ Set by test harnesses that only need the model functions.")
     (if books
         (insert (spine-render "index.mustache"
                   (spine-index-model books shelf-filter (cadr (assoc "id" query)))))
-      (insert (spine-render-empty-state))))
+      (insert (spine-render-empty-state)))))
 
 (defun httpd/add (proc uri-path query request)
   "Handle /add: GET shows form, POST creates a book."
diff --git a/templates/add.mustache b/templates/add.mustache
index 1e16361..acd4778 100644
--- a/templates/add.mustache
+++ b/templates/add.mustache
@@ -60,10 +60,11 @@
       <form method="post" action="/add">
         <label>Date added <input type="date" name="date_added" /></label>
         <label>Title * <input type="text" name="title" required autofocus /></label>
-        <label>Author <input type="text" name="author" list="authors-list" /></label>
-        <datalist id="authors-list">{{#existing_authors}}<option value="{{.}}">{{/existing_authors}}</datalist>
-        <label>Category <input type="text" name="category" list="categories-list" /></label>
-        <datalist id="categories-list">{{#existing_categories}}<option value="{{.}}">{{/existing_categories}}</datalist>
+        <label>Author <input type="text" name="author" /></label>
+        <label>Shelf * <select name="shelf" required>
+          <option value="">— select —</option>
+          {{#shelves}}<option value="{{.}}">{{.}}</option>{{/shelves}}
+        </select></label>
         <label>Format <select name="format"><option value="">—</option><option value="hardcover">Hardcover</option><option value="ebook">eBook</option><option value="audiobook">Audiobook</option></select></label>
         <label>ISBN <input type="text" name="isbn" /></label>
         <label>Cover (path) <input type="text" name="cover" placeholder="covers/filename.jpg" /></label>
diff --git a/templates/index.mustache b/templates/index.mustache
index 3a55277..93b045a 100644
--- a/templates/index.mustache
+++ b/templates/index.mustache
@@ -40,10 +40,6 @@
   .group { padding:10px 14px 4px; font-size:11px; letter-spacing:0.04em; color: var(--text-tertiary); }
   .row { display:flex; align-items:center; gap:10px; padding:5px 14px; font-size:13px; }
   .glyph { font-size:15px; color:var(--text-tertiary); width:16px; }
-  .pill { padding:1px 7px; border-radius:var(--radius-md); font-size:11px; }
-  .pill.want { background:var(--bg-info); color:var(--text-info); }
-  .pill.reading { background:var(--bg-warning); color:var(--text-warning); }
-  .pill.read { background:var(--bg-success); color:var(--text-success); }
   .title { flex:1; min-width:0; }
   .muted { color:var(--text-tertiary); }
   .tags { color:var(--text-info); font-size:12px; }
@@ -66,30 +62,22 @@
   <div class="frame">
     <div class="titlebar">
       <span style="font-weight:500;">spine</span>
-      <span class="muted">{{total_books}} books · {{reading_count}} reading</span>
+      <span class="muted">{{total_books}} books · {{shelf_count}} shelves</span>
     </div>
 
-    {{#current_filter}}
     <div class="filter-bar">
-      <a href="/index">Concise view</a>
-    </div>
-    {{/current_filter}}
-    {{^current_filter}}
-    <div class="filter-bar">
-      <a href="/index?filter=all">All books ({{total_books}})</a>
+      <a href="/index"{{^current_shelf}} style="font-weight:600"{{/current_shelf}}>All</a>
+      {{#shelf_nav}}
       &nbsp;·&nbsp;
-      <a href="/index?filter=want">Want list</a>
-      &nbsp;·&nbsp;
-      <a href="/index?filter=read">Read ({{reading_count}})</a>
+      <a href="{{href}}"{{#current}} style="font-weight:600"{{/current}}>{{name}}</a>
+      {{/shelf_nav}}
     </div>
-    {{/current_filter}}
 
     {{#groups}}
     <div class="group">{{label}} · {{count}}</div>
     {{#books}}
     <div class="row{{#selected}} selected{{/selected}}">
       <i class="ti {{format_icon}} glyph" aria-hidden="true"></i>
-      <span class="pill {{status_class}}">{{status_label}}</span>
       <span class="title">{{title}} <span class="muted">· {{author}}</span></span>
       {{#tags_inline}}<span class="tags">{{tags_inline}}</span>{{/tags_inline}}
       {{#rec_via}}<span class="trail">via {{rec_via}}</span>{{/rec_via}}
@@ -106,10 +94,6 @@
     {{/books}}
     {{/groups}}
 
-    {{#summary_groups}}
-    <div class="group"><a href="{{href}}" style="color:var(--text-info);text-decoration:none">{{label}} · {{count}}</a></div>
-    {{/summary_groups}}
-
     {{#minibuffer}}
     <div class="minibuffer">
       <span class="muted">M-x</span>