diff --git a/static/style.css b/static/style.css
index 7ab27fe..fc9a19f 100644
--- a/static/style.css
+++ b/static/style.css
@@ -795,10 +795,8 @@ a:hover { color: var(--accent-hover); }
     align-items: flex-start;
     gap: 8px;
     padding: 6px 12px;
-    background: var(--surface);
-    border: 1px solid var(--border);
-    border-radius: var(--radius);
-    margin-bottom: 8px;
+    border-bottom: 1px solid var(--border);
+    transition: background var(--transition);
 }
 
 .capture-text {
@@ -818,14 +816,11 @@ a:hover { color: var(--accent-hover); }
     align-items: center;
     gap: 8px;
     padding: 6px 12px;
-    background: var(--surface);
-    border: 1px solid var(--border);
-    border-radius: var(--radius);
-    margin-bottom: 6px;
-    transition: all var(--transition);
+    border-bottom: 1px solid var(--border);
+    transition: background var(--transition);
 }
 
-.focus-item:hover { border-color: var(--accent); }
+.focus-item:hover { background: var(--surface2); }
 .focus-item.completed { opacity: 0.6; }
 .focus-item.completed .focus-title { text-decoration: line-through; }
 
diff --git a/templates/capture.html b/templates/capture.html
index 021682d..63b2968 100644
--- a/templates/capture.html
+++ b/templates/capture.html
@@ -53,11 +53,12 @@
 </div>
 
 {% if items %}
+<div class="card">
 {% for item in items %}
 
 {# Batch header #}
 {% if item._batch_first and item.import_batch_id %}
-<div class="flex items-center justify-between mb-2 mt-3" style="padding:6px 12px;background:var(--surface2);border-radius:var(--radius-sm)">
+<div class="flex items-center justify-between" style="padding:6px 12px;background:var(--surface2);">
     <span class="text-xs text-muted">Batch &middot; {{ batches[item.import_batch_id|string] }} items</span>
     <form action="/capture/batch/{{ item.import_batch_id }}/undo" method="post" style="display:inline" data-confirm="Delete all items in this batch?">
         <button class="btn btn-ghost btn-xs" style="color:var(--red)">Undo batch</button>
@@ -99,6 +100,7 @@
     {% endif %}
 </div>
 {% endfor %}
+</div>
 {% else %}
 <div class="empty-state">
     <div class="empty-state-icon">&#128229;</div>
diff --git a/templates/focus.html b/templates/focus.html
index 1d96b64..926ac77 100644
--- a/templates/focus.html
+++ b/templates/focus.html
@@ -14,6 +14,7 @@
 
 <!-- Focus items -->
 {% if items %}
+<div class="card">
 {% for item in items %}
 <div class="focus-item {{ 'completed' if item.completed }}">
     {% with reorder_url="/focus/reorder", item_id=item.id, extra_fields={"focus_date": focus_date|string} %}
@@ -35,6 +36,7 @@
     </form>
 </div>
 {% endfor %}
+</div>
 {% else %}
 <div class="empty-state mb-4"><div class="empty-state-text">No focus items for this day</div></div>
 {% endif %}