diff --git a/src/animaltrack/web/templates/registry.py b/src/animaltrack/web/templates/registry.py
index 2c15d1e..c779ec6 100644
--- a/src/animaltrack/web/templates/registry.py
+++ b/src/animaltrack/web/templates/registry.py
@@ -96,26 +96,30 @@ def registry_header(filter_str: str, total_count: int) -> Div:
         Form(
             # Label above the input row
             FormLabel("Filter", _for="filter", cls="mb-2 block"),
-            Div(
+            Grid(
                 # Filter input - takes most of the width
                 Input(
                     id="filter",
                     name="filter",
                     value=filter_str,
                     placeholder='species:duck status:alive location:"Strip 1"',
-                    cls="uk-input flex-1",
+                    cls="uk-input col-span-10",
                 ),
-                # Apply button
-                Button("Apply", type="submit", cls=f"{ButtonT.primary} px-4"),
-                # Clear button (only shown if filter is active)
-                A(
-                    "Clear",
-                    href="/registry",
-                    cls="px-3 py-2 text-stone-400 hover:text-stone-200",
-                )
-                if filter_str
-                else None,
-                cls="flex gap-2 items-center",
+                # Buttons container
+                Div(
+                    Button("Apply", type="submit", cls=f"{ButtonT.primary} px-4"),
+                    # Clear button (only shown if filter is active)
+                    A(
+                        "Clear",
+                        href="/registry",
+                        cls="px-3 py-2 text-stone-400 hover:text-stone-200",
+                    )
+                    if filter_str
+                    else None,
+                    cls="flex gap-2 col-span-2",
+                ),
+                cols=12,
+                cls="gap-2 items-center",
             ),
             action="/registry",
             method="get",