diff --git a/src/main/resources/templates/layouts/base.html b/src/main/resources/templates/layouts/base.html
index 0dcf4d4..f0b469b 100644
--- a/src/main/resources/templates/layouts/base.html
+++ b/src/main/resources/templates/layouts/base.html
@@ -30,34 +30,35 @@
   </script>
 </head>
 <body class="min-h-screen bg-base-100">
-  <div class="navbar bg-base-300 shadow-lg" style="padding:0 1rem;min-height:3.5rem;display:flex;align-items:center">
-    <div style="display:flex;align-items:center;gap:1.5rem;margin-right:auto">
-      <a href="/" class="font-bold text-lg text-base-content no-underline">DiscDrop</a>
-      <div id="search-wrapper" style="width:18rem">
-        <form hx-get="/api/artists/search"
-              hx-target="#search-results"
-              hx-swap="innerHTML"
-              hx-trigger="keyup changed delay:300ms from:#search-input">
-          <input id="search-input" type="text" placeholder="Search artists..."
-                 class="input input-bordered input-sm w-full" name="q" autocomplete="off">
-        </form>
-        <div id="search-results"></div>
+  <div class="navbar bg-base-300 shadow-lg" style="min-height:3.5rem;display:flex;align-items:center;justify-content:center">
+    <div style="display:flex;align-items:center;width:100%;max-width:1100px;padding:0 1rem;gap:2rem">
+      <a href="/" class="font-bold text-lg text-base-content no-underline" style="flex-shrink:0">DiscDrop</a>
+      <div style="flex:1;display:flex;justify-content:center">
+        <div id="search-wrapper" style="width:18rem">
+          <form hx-get="/api/artists/search"
+                hx-target="#search-results"
+                hx-swap="innerHTML"
+                hx-trigger="keyup changed delay:300ms from:#search-input">
+            <input id="search-input" type="text" placeholder="Search artists..."
+                   class="input input-bordered input-sm w-full" name="q" autocomplete="off">
+          </form>
+          <div id="search-results"></div>
+        </div>
+      </div>
+      <a href="/artists" class="font-medium text-base-content no-underline {#if activeTab == 'artists'}font-bold{/if}" style="flex-shrink:0">Artists</a>
+      <div style="display:flex;align-items:center;gap:0.5rem;flex-shrink:0;margin-left:1rem">
+        <select class="select select-bordered select-sm" style="width:7rem" onchange="setTheme(this)">
+          <option value="dark">Dark</option>
+          <option value="light">Light</option>
+          <option value="synthwave">Synthwave</option>
+          <option value="retro">Retro</option>
+          <option value="dracula">Dracula</option>
+          <option value="night">Night</option>
+          <option value="dim">Dim</option>
+          <option value="nord">Nord</option>
+        </select>
+        <button class="btn btn-ghost btn-sm" onclick="settingsModal.showModal()">⚙️</button>
       </div>
-      <a href="/artists" class="font-medium text-base-content no-underline {#if activeTab == 'artists'}font-bold{/if}">Artists</a>
-    </div>
-
-    <div style="display:flex;align-items:center;gap:0.5rem">
-      <select class="select select-bordered select-sm" style="width:7rem" onchange="setTheme(this)">
-        <option value="dark">Dark</option>
-        <option value="light">Light</option>
-        <option value="synthwave">Synthwave</option>
-        <option value="retro">Retro</option>
-        <option value="dracula">Dracula</option>
-        <option value="night">Night</option>
-        <option value="dim">Dim</option>
-        <option value="nord">Nord</option>
-      </select>
-      <button class="btn btn-ghost btn-sm" onclick="settingsModal.showModal()">⚙️</button>
     </div>
   </div>
 
