diff --git a/attached_assets/targeted_element_1758476700613.png b/attached_assets/targeted_element_1758476700613.png
new file mode 100644
index 00000000..cf12d1c0
Binary files /dev/null and b/attached_assets/targeted_element_1758476700613.png differ
diff --git a/backend/templates/components/layout/enhanced_header.html b/backend/templates/components/layout/enhanced_header.html
index 74f86ddc..5b40a5dd 100644
--- a/backend/templates/components/layout/enhanced_header.html
+++ b/backend/templates/components/layout/enhanced_header.html
@@ -6,7 +6,7 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
 {% load static %}
 
 <header class="sticky top-0 z-50 w-full border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
-  <div class="flex h-14 items-center justify-between px-4 max-w-full">
+  <div class="grid grid-cols-[auto_1fr_auto] items-center h-14 px-4 gap-4">
     
     <!-- Logo and Browse Menu -->
     <div class="flex items-center space-x-6">
@@ -131,8 +131,8 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
       </div>
     </div>
 
-    <!-- Desktop Right Side -->
-    <div class="hidden md:flex items-center space-x-4">
+    <!-- Center Search Bar -->
+    <div class="hidden md:block justify-self-center w-full max-w-xl lg:max-w-2xl">
       <!-- Enhanced Search -->
       <div class="relative" x-data="searchComponent">
         <div class="relative">
@@ -140,7 +140,7 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
           <input
             type="search"
             placeholder="Search parks, rides..."
-            class="w-[300px] pl-10 pr-20 h-10 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
+            class="w-full md:max-w-xl lg:max-w-2xl pl-10 pr-14 h-10 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
             x-model="query"
             @input.debounce.300ms="search()"
             hx-get="{% url 'search:search' %}"
@@ -149,7 +149,7 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
             hx-include="this"
             name="q"
           />
-          <c-button variant="default" size="sm" class="absolute right-1 top-1/2 transform -translate-y-1/2">Search</c-button>
+          <c-button variant="default" size="default" class="absolute right-2 top-1/2 transform -translate-y-1/2">Search</c-button>
         </div>
         
         <!-- Search Results Dropdown -->
@@ -163,6 +163,10 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
           <!-- Search results will be populated by HTMX -->
         </div>
       </div>
+    </div>
+
+    <!-- Desktop Right Side -->
+    <div class="hidden md:flex items-center gap-3 shrink-0">
 
       <!-- Theme Toggle -->
       <div x-data="themeToggle">
@@ -237,19 +241,21 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
           </div>
         </div>
       {% else %}
-        <div class="flex items-center space-x-2">
-          <button 
-            @click="window.authModal.show('login')"
-            class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-9 rounded-md px-3"
+        <div class="flex items-center gap-2">
+          <c-button 
+            variant="outline" 
+            size="default"
+            x_on="@click='window.authModal.show(\'login\')'"
           >
             Sign In
-          </button>
-          <button 
-            @click="window.authModal.show('register')"
-            class="inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 bg-primary text-primary-foreground hover:bg-primary/90 h-9 rounded-md px-3"
+          </c-button>
+          <c-button 
+            variant="default" 
+            size="default"
+            x_on="@click='window.authModal.show(\'register\')'"
           >
             Sign Up
-          </button>
+          </c-button>
         </div>
       {% endif %}
     </div>
@@ -308,23 +314,25 @@ Includes: Browse menu, advanced search, theme toggle, user dropdown, mobile menu
           </div>
         </div>
       {% else %}
-        <div class="flex items-center space-x-1">
-          <div 
-            hx-get="{% url 'account_login' %}"
-            hx-target="body"
-            hx-swap="beforeend"
-            class="cursor-pointer"
+        <div class="flex items-center gap-1">
+          <c-button 
+            variant="outline" 
+            size="default"
+            hx_get="{% url 'account_login' %}"
+            hx_target="body"
+            hx_swap="beforeend"
           >
-            <c-button variant="outline" size="default">Login</c-button>
-          </div>
-          <div 
-            hx-get="{% url 'account_signup' %}"
-            hx-target="body"
-            hx-swap="beforeend"
-            class="cursor-pointer"
+            Login
+          </c-button>
+          <c-button 
+            variant="default" 
+            size="default"
+            hx_get="{% url 'account_signup' %}"
+            hx_target="body"
+            hx_swap="beforeend"
           >
-            <c-button variant="default" size="default">Join</c-button>
-          </div>
+            Join
+          </c-button>
         </div>
       {% endif %}