diff --git a/resources/views/livewire/partials/search-filter.blade.php b/resources/views/livewire/partials/search-filter.blade.php
index 39a0588..f5d8a1a 100644
--- a/resources/views/livewire/partials/search-filter.blade.php
+++ b/resources/views/livewire/partials/search-filter.blade.php
@@ -1,90 +1,139 @@
-<!-- Search Filter -->
-<div>
-    <div class="p-4 sm:p-8 bg-white/40 dark:bg-neutral-950/40 backdrop-blur shadow sm:rounded-lg">
-        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4">
+<!-- Search Filters -->
+<div class="space-y-4">
+    <div class="rounded-2xl border border-neutral-200/70 bg-white/80 p-4 shadow-sm backdrop-blur-xl dark:border-neutral-800 dark:bg-neutral-950/70">
+        
+        <!-- Filters Grid -->
+        <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-5">
 
-            <!-- Title -->
-            <div>
-                <label for="live-search" class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Search</label>
-                <div class="relative right-2 left-0 sm:left-2 transition-all">
-                    <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
-                        <svg class="w-4 h-4 text-gray-500 dark:text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
-                            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z" />
+            <!-- Search -->
+            <div class="xl:col-span-2">
+                <label for="live-search" class="sr-only">
+                    {{ __('search.search-hentai') }}
+                </label>
+
+                <div class="relative">
+                    <!-- Search Icon -->
+                    <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-4">
+                        <svg class="h-5 w-5 text-neutral-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
+                            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z" />
                         </svg>
                     </div>
 
-                    <input wire:model.live.debounce.600ms="search" type="search" id="live-search" class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900" placeholder="{{ __('search.search-hentai') }}" required>
+                    <!-- Input -->
+                    <input
+                        wire:model.live.debounce.500ms="search"
+                        type="search"
+                        id="live-search"
+                        placeholder="{{ __('search.search-hentai') }}"
+                        class="w-full rounded-xl border border-neutral-300 bg-white py-5 pl-12 pr-12 text-sm text-neutral-900 shadow-sm transition focus:border-rose-500 focus:outline-none focus:ring-4 focus:ring-rose-500/20 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white dark:placeholder-neutral-500"
+                    />
 
-                    <div class="absolute right-0 top-[11px]" wire:loading>
-                        <svg aria-hidden="true" class="inline w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-pink-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor" />
-                            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill" />
+                    <!-- Loading -->
+                    <div class="absolute inset-y-0 right-3 flex items-center" wire:loading>
+                        <svg class="h-5 w-5 animate-spin text-rose-500" viewBox="0 0 24 24" fill="none">
+                            <circle class="opacity-20" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                            <path class="opacity-90" fill="currentColor"
+                                d="M22 12a10 10 0 0 1-10 10V18a6 6 0 0 0 6-6h4Z">
+                            </path>
                         </svg>
                     </div>
                 </div>
             </div>
 
             <!-- Genres -->
-            <div>
-                <div class="relative right-2 left-0 sm:left-2 transition-all">
-                    <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
-                        <i class="fa-solid fa-sliders text-gray-500 dark:text-gray-400"></i>
-                    </div>
-                    <p data-te-toggle="modal" data-te-target="#modalGenres" data-te-ripple-init data-te-ripple-color="light" id="genres-filter" class="block cursor-pointer w-full p-4 pl-10 text-sm text-gray-500 dark:text-gray-400 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:focus:ring-rose-800 dark:focus:border-rose-900">
-                        @if($tagcount === 0)
-                        Select Genres
-                        @elseif($tagcount === 1)
-                        Selected {{$tagcount }} Genre
-                        @elseif($tagcount > 1)
-                        Selected {{$tagcount }} Genres
-                        @endif
-                    </p>
-                </div>
-            </div>
+            <button
+                type="button"
+                data-te-toggle="modal"
+                data-te-target="#modalGenres"
+                class="group flex items-center gap-3 rounded-xl border border-neutral-300 bg-white px-4 py-3 text-left shadow-sm transition hover:border-rose-400 hover:bg-rose-50 dark:border-neutral-700 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+            >
+                <i class="fa-solid fa-sliders text-neutral-400 group-hover:text-rose-500"></i>
 
-            <!-- Genres Blacklist -->
-            <div>
-                <div class="relative right-2 left-0 sm:left-2 transition-all">
-                    <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
-                        <i class="fa-solid fa-shield text-gray-500 dark:text-gray-400"></i>
-                    </div>
-                    <p data-te-toggle="modal" data-te-target="#modalBlacklist" data-te-ripple-init data-te-ripple-color="light" id="blacklist-filter" class="block cursor-pointer w-full p-4 pl-10 text-sm text-gray-500 dark:text-gray-400 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:focus:ring-rose-800 dark:focus:border-rose-900">
-                        @if($blacklistcount === 0)
-                        Select Blacklist
-                        @elseif($blacklistcount === 1)
-                        Selected {{ $blacklistcount }} Blacklist Item
-                        @elseif($blacklistcount > 1)
-                        Selected {{ $blacklistcount }} Blacklist Items
+                <div class="flex flex-col">
+                    <span class="text-xs font-medium uppercase tracking-wide text-neutral-400">
+                        Genres
+                    </span>
+
+                    <span class="text-sm text-neutral-700 dark:text-neutral-200">
+                        @if($tagcount === 0)
+                            Select Genres
+                        @elseif($tagcount === 1)
+                            1 Genre Selected
+                        @else
+                            {{ $tagcount }} Genres Selected
                         @endif
-                    </p>
+                    </span>
                 </div>
-            </div>
+            </button>
+
+            <!-- Blacklist -->
+            <button
+                type="button"
+                data-te-toggle="modal"
+                data-te-target="#modalBlacklist"
+                class="group flex items-center gap-3 rounded-xl border border-neutral-300 bg-white px-4 py-3 text-left shadow-sm transition hover:border-rose-400 hover:bg-rose-50 dark:border-neutral-700 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+            >
+                <i class="fa-solid fa-shield text-neutral-400 group-hover:text-rose-500"></i>
+
+                <div class="flex flex-col">
+                    <span class="text-xs font-medium uppercase tracking-wide text-neutral-400">
+                        Blacklist
+                    </span>
+
+                    <span class="text-sm text-neutral-700 dark:text-neutral-200">
+                        @if($blacklistcount === 0)
+                            Select Blacklist
+                        @elseif($blacklistcount === 1)
+                            1 Item Selected
+                        @else
+                            {{ $blacklistcount }} Items Selected
+                        @endif
+                    </span>
+                </div>
+            </button>
 
             <!-- Studios -->
-            <div>
-                <div class="relative right-2 left-0 sm:left-2 transition-all">
-                    <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
-                        <i class="fa-solid fa-microphone-lines text-gray-500 dark:text-gray-400"></i>
-                    </div>
-                    <p data-te-toggle="modal" data-te-target="#modalStudios" data-te-ripple-init data-te-ripple-color="light" id="studios-filter" class="block cursor-pointer w-full p-4 pl-10 text-sm text-gray-500 dark:text-gray-400 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:focus:ring-rose-800 dark:focus:border-rose-900">
-                        @if($studiocount === 0)
-                        Select Studios
-                        @elseif($studiocount === 1)
-                        Selected {{ $studiocount }} Studio
-                        @elseif($studiocount > 1)
-                        Selected {{ $studiocount }} Studios
-                        @endif
-                    </p>
-                </div>
-            </div>
+            <button
+                type="button"
+                data-te-toggle="modal"
+                data-te-target="#modalStudios"
+                class="group flex items-center gap-3 rounded-xl border border-neutral-300 bg-white px-4 py-3 text-left shadow-sm transition hover:border-rose-400 hover:bg-rose-50 dark:border-neutral-700 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+            >
+                <i class="fa-solid fa-microphone-lines text-neutral-400 group-hover:text-rose-500"></i>
 
-            <!-- Ordering -->
-            <div class="grid grid-cols-2">
-                <div class="relative right-2 left-0 sm:left-2 transition-all">
-                    <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
-                        <i class="fa-solid fa-sort text-gray-500 dark:text-gray-400"></i>
-                    </div>
-                    <select wire:model.live="order" class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900">
+                <div class="flex flex-col">
+                    <span class="text-xs font-medium uppercase tracking-wide text-neutral-400">
+                        Studios
+                    </span>
+
+                    <span class="text-sm text-neutral-700 dark:text-neutral-200">
+                        @if($studiocount === 0)
+                            Select Studios
+                        @elseif($studiocount === 1)
+                            1 Studio Selected
+                        @else
+                            {{ $studiocount }} Studios Selected
+                        @endif
+                    </span>
+                </div>
+            </button>
+        </div>
+
+        <!-- Bottom Controls -->
+        <div class="mt-4 flex flex-col gap-4 border-t border-neutral-200 pt-4 dark:border-neutral-800 lg:flex-row lg:items-center lg:justify-between">
+
+            <!-- Selects -->
+            <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+
+                <!-- Order -->
+                <div class="relative">
+                    <i class="fa-solid fa-sort pointer-events-none absolute left-4 top-1/2 -translate-y-1/2 text-neutral-400"></i>
+
+                    <select
+                        wire:model.live="order"
+                        class="w-full appearance-none rounded-xl border border-neutral-300 bg-white py-3 pl-11 pr-10 text-sm text-neutral-900 shadow-sm transition focus:border-rose-500 focus:outline-none focus:ring-4 focus:ring-rose-500/20 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white"
+                    >
                         <option value="az">A-Z</option>
                         <option value="za">Z-A</option>
                         <option value="recently-uploaded">{{ __('home.recently-uploaded') }}</option>
@@ -95,28 +144,40 @@
                     </select>
                 </div>
 
-                <div class="relative right-2 left-0 ml-2 sm:left-2 transition-all">
-                    <div class="absolute inset-y-0 left-2 flex items-center pl-3 pointer-events-none">
-                        <i class="fa-solid fa-list text-gray-500 dark:text-gray-400"></i>
-                    </div>
-                    <select wire:model.live="view" class="block w-full p-4 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-rose-800 focus:border-rose-900 dark:bg-neutral-900 dark:border-neutral-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-rose-800 dark:focus:border-rose-900">
+                <!-- View -->
+                <div class="relative">
+                    <i class="fa-solid fa-list pointer-events-none absolute left-4 top-1/2 -translate-y-1/2 text-neutral-400"></i>
+
+                    <select
+                        wire:model.live="view"
+                        class="w-full appearance-none rounded-xl border border-neutral-300 bg-white py-3 pl-11 pr-10 text-sm text-neutral-900 shadow-sm transition focus:border-rose-500 focus:outline-none focus:ring-4 focus:ring-rose-500/20 dark:border-neutral-700 dark:bg-neutral-900 dark:text-white"
+                    >
                         <option value="thumbnail">Thumbnail</option>
                         <option value="poster">Poster</option>
                     </select>
                 </div>
             </div>
-        </div>
 
-        @auth
-        <div class="float-right pt-1">
-            <input class="w-4 h-4 text-rose-600 bg-gray-100 border-gray-300 rounded focus:ring-rose-500 dark:focus:ring-rose-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
-                type="checkbox" wire:model.live="hideWatched" value="true" id="checkBoxHideWatched" />
-            <label class="inline-block hover:cursor-pointer dark:text-white" for="checkBoxHideWatched">
-                Hide watched
-            </label>
+            <!-- Auth Options -->
+            @auth
+                <label
+                    for="checkBoxHideWatched"
+                    class="flex cursor-pointer items-center gap-3 text-sm text-neutral-700 dark:text-neutral-300"
+                >
+                    <input
+                        id="checkBoxHideWatched"
+                        type="checkbox"
+                        wire:model.live="hideWatched"
+                        class="h-4 w-4 rounded border-neutral-300 text-rose-600 focus:ring-rose-500 dark:border-neutral-700 dark:bg-neutral-800"
+                    />
+
+                    <span>Hide watched</span>
+                </label>
+            @endauth
         </div>
-        @endauth
     </div>
+
+    <!-- Modals -->
     @include('modals.filter-genres')
     @include('modals.filter-studios')
     @include('modals.filter-blacklist')