diff --git a/frontend/src/Header.svelte b/frontend/src/Header.svelte
index fedd7b2..30d5d22 100644
--- a/frontend/src/Header.svelte
+++ b/frontend/src/Header.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import logo from "./assets/images/AniTrackLogo.svg"
     import Search from "./Search.svelte"
     import {
         aniListLoggedIn,
@@ -16,6 +15,7 @@
     import type {SimklUser} from "./simkl/types/simklTypes";
     import type {MyAnimeListUser} from "./mal/types/MALTypes";
     import AvatarMenu from "./AvatarMenu.svelte";
+    import logo from "./assets/images/AniTrackLogo.svg"
 
     let isAniListLoggedIn: boolean
     let isSimklLoggedIn: boolean
@@ -32,67 +32,72 @@
     malUser.subscribe((value) => currentMALUser = value)
 </script>
 
-<header class="mb-2">
-    <nav class="bg-white border-gray-200 px-4 lg:px-6 py-2.5 dark:bg-gray-800">
-        <div class="flex justify-between items-center mx-auto max-w-screen-lg">
-            <img src={logo} class="mr-3 h-6 sm:h-9" alt="AniTrack Logo"/>
-
-            <div class="flex space-x-4 items-center">
-
-                <button data-collapse-toggle="mobile-menu-2" type="button"
-                        class="inline-flex items-center p-2 ml-1 text-sm text-gray-500 rounded-lg lg:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
-                        aria-controls="mobile-menu-2" aria-expanded="false">
-                    <span class="sr-only">Open main menu</span>
-                    <svg class="w-6 h-6" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                        <path fill-rule="evenodd"
-                              d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z"
-                              clip-rule="evenodd"></path>
-                    </svg>
-                    <svg class="hidden w-6 h-6" fill="currentColor" viewBox="0 0 20 20"
-                         xmlns="http://www.w3.org/2000/svg">
-                        <path fill-rule="evenodd"
-                              d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
-                              clip-rule="evenodd"></path>
-                    </svg>
-                </button>
-                <div class="hidden justify-between items-center w-full lg:flex md:space-x-20 lg:mx-auto lg:max-w-screen-xl"
-                     id="mobile-menu-2">
-                    <ul class="flex flex-col mt-4 font-medium md:flex-row md:space-x-2 md:mt-0">
-                        <li>
-                            {#if isAniListLoggedIn}
-                                <span class="bg-green-100 text-green-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-green-800 dark:text-green-200 cursor-default">AniList: {currentAniListUser.data.Viewer.name}</span>
-                            {:else}
-                                <button on:click={loginToAniList}
-                                        class="bg-blue-100 hover:bg-blue-200 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-blue-400 border border-blue-400 inline-flex items-center justify-center">
-                                    AniList
-                                </button>
-                            {/if}
-                        </li>
-                        <li>
-                            {#if isMALLoggedIn}
-                                <span class="bg-blue-100 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-blue-800 dark:text-blue-200 cursor-default">MAL: {currentMALUser.name}</span>
-                            {:else}
-                                <button on:click={loginToMAL}
-                                        class="bg-blue-100 hover:bg-blue-200 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-blue-400 border border-blue-400 inline-flex items-center justify-center">
-                                    MAL
-                                </button>
-                            {/if}
-                        </li>
-                        <li>
-                            {#if isSimklLoggedIn}
-                                <span class="bg-indigo-100 text-indigo-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-indigo-800 dark:text-indigo-200 cursor-default">Simkl: {currentSimklUser.user.name}</span>
-                            {:else}
-                                <button on:click={loginToSimkl}
-                                        class="bg-blue-100 hover:bg-blue-200 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-blue-400 border border-blue-400 inline-flex items-center justify-center">
-                                    Simkl
-                                </button>
-                            {/if}
-                        </li>
-                    </ul>
-                    <Search/>
-                </div>
-                <AvatarMenu />
+<nav class="bg-white border-gray-200 dark:bg-gray-900">
+    <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+        <div class="flex items-center space-x-3 rtl:space-x-reverse">
+            <img src={logo} class="h-8" alt="AniTrack Logo"/>
+        </div>
+        <div class="flex items-center min-[950px]:order-2 space-x-3 min-[950px]:space-x-0 rtl:space-x-reverse">
+            <div class="min-[950px]:block min-[950px]:mr-4">
+                <Search />
+            </div>
+            <AvatarMenu/>
+            <button on:click={() => {
+                let menu = document.querySelector("#navbar-user")
+                menu.classList.toggle("hidden")
+            }} type="button"
+                    class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg min-[950px]:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
+                    aria-controls="navbar-user" aria-expanded="false">
+                <span class="sr-only">Open main menu</span>
+                <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"
+                     viewBox="0 0 17 14">
+                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                          d="M1 1h15M1 7h15M1 13h15"/>
+                </svg>
+            </button>
+        </div>
+        <div class="hidden items-center justify-between w-full pb-4 min-[950px]:pb-0 min-[950px]:flex min-[950px]:w-auto min-[950px]:order-1 border border-gray-100 dark:border-gray-700 min-[950px]:border-0 bg-gray-50 dark:bg-gray-800 min-[950px]:bg-transparent min-[950px]:dark:bg-transparent rounded-lg" id="navbar-user">
+            <ul class="flex flex-col font-medium pb-6 min-[950px]:p-0 mt-4 min-[950px]:space-x-8 rtl:space-x-reverse min-[950px]:flex-row min-[950px]:mt-0">
+                <li>
+                    {#if isAniListLoggedIn}
+                        <div class="flex justify-center py-2 px-3 rounded bg-transparent min-[950px]:p-0">
+                            <span class="w-48 min-[950px]:w-auto bg-green-100 text-green-800 text-sm font-medium me-2 px-3 py-2 rounded dark:bg-green-800 dark:text-green-200 cursor-default">AniList: {currentAniListUser.data.Viewer.name}</span>
+                        </div>
+                    {:else}
+                        <button on:click={loginToAniList}
+                                class="block py-2 px-3 text-gray-900 w-full min-[950px]:w-auto rounded hover:bg-gray-100 min-[950px]:hover:bg-transparent min-[950px]:hover:text-blue-700 min-[950px]:p-0 dark:text-white min-[950px]:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white min-[950px]:dark:hover:bg-transparent dark:border-gray-700">
+                            AniList Login
+                        </button>
+                    {/if}
+                </li>
+                <li>
+                    {#if isMALLoggedIn}
+                        <div class="flex justify-center py-2 px-3 rounded bg-transparent min-[950px]:p-0">
+                            <span class="w-48 min-[950px]:w-auto bg-blue-100 text-blue-800 text-sm font-medium me-2 px-3 py-2 rounded dark:bg-blue-800 dark:text-blue-200 cursor-default">MyAnimeList: {currentMALUser.name}</span>
+                        </div>
+                    {:else}
+                        <button on:click={loginToMAL}
+                                class="block py-2 px-3 text-gray-900 w-full min-[950px]:w-auto rounded hover:bg-gray-100 min-[950px]:hover:bg-transparent min-[950px]:hover:text-blue-700 min-[950px]:p-0 dark:text-white min-[950px]:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white min-[950px]:dark:hover:bg-transparent dark:border-gray-700">
+                            MyAnimeList Login
+                        </button>
+                    {/if}
+                </li>
+                <li>
+                    {#if isSimklLoggedIn}
+                        <div class="flex justify-center py-2 px-3 rounded bg-transparent min-[950px]:p-0">
+                            <span class="w-48 min-[950px]:w-auto bg-indigo-100 text-indigo-800 text-sm font-medium me-2 px-3 py-2 rounded dark:bg-indigo-800 dark:text-indigo-200 cursor-default">Simkl: {currentSimklUser.user.name}</span>
+                        </div>
+                    {:else}
+                        <button on:click={loginToSimkl}
+                                class="block py-2 px-3 text-gray-900 w-full min-[950px]:w-auto rounded hover:bg-gray-100 min-[950px]:hover:bg-transparent min-[950px]:hover:text-blue-700 min-[950px]:p-0 dark:text-white min-[950px]:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white min-[950px]:dark:hover:bg-transparent dark:border-gray-700">
+                            Simkl Login
+                        </button>
+                    {/if}
+                </li>
+            </ul>
+            <div class="flex justify-center min-[950px]:hidden">
+                <Search/>
             </div>
         </div>
-    </nav>
-</header>
+    </div>
+</nav>
diff --git a/frontend/src/Search.svelte b/frontend/src/Search.svelte
index 0f70788..e60b9fe 100644
--- a/frontend/src/Search.svelte
+++ b/frontend/src/Search.svelte
@@ -24,7 +24,7 @@
 </script>
 
 
-<div id="searchDropdown" class="relative">
+<div id="searchDropdown" class="relative w-64 md:w-48">
         <div class="flex">
             <label for="anime-search" class="mb-2 text-sm font-medium text-gray-900 sr-only dark:text-white">Find
                 Anime</label>