diff --git a/static/css/style.css b/static/css/style.css
index 1dd4524..dbb8290 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -172,7 +172,7 @@
         }
 
         .tab-content {
-            display: none;
+            /* Managed by Alpine.js x-show */
         }
 
         .tab-content.active {
diff --git a/static/js/auth.js b/static/js/auth.js
index 6f0342d..3e0a0db 100644
--- a/static/js/auth.js
+++ b/static/js/auth.js
@@ -91,14 +91,27 @@ async function checkAuth() {
 
         if (response.ok) {
             const data = await response.json();
-            
+
+            // Log for debugging
+            console.log('Auth check successful for:', data.user.username);
+
             // Dispatch event for Alpine.js global state
             window.dispatchEvent(new CustomEvent('auth-success', { 
                 detail: { username: data.user.full_name || data.user.username } 
             }));
-            
+
+            // Set global auth state in case dispatch was too early
+            if (window.Alpine) {
+                const body = document.querySelector('body');
+                if (body && body.__x) {
+                    body.__x.$data.isAuthenticated = true;
+                    body.__x.$data.username = data.user.full_name || data.user.username;
+                }
+            }
+
             return true;
-        } else {
+        }
+ else {
             // Token invalid, remove it and redirect
             removeToken();
             redirectToLogin();
diff --git a/static/js/main.js b/static/js/main.js
index 14d8cef..7865802 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -195,63 +195,11 @@ async function handleDownloadProviderEpisode(providerId) {
 }
 
 /**
- * Switch between tabs
+ * Switch between tabs (Modernized to Alpine.js)
  */
 function switchTab(tabName) {
-    // Hide all tabs
-    document.querySelectorAll('.tab-content').forEach(tab => {
-        tab.classList.remove('active');
-    });
-    document.querySelectorAll('.tab').forEach(btn => {
-        btn.classList.remove('active');
-    });
-
-    // Show selected tab
-    const tabElement = document.getElementById(`tab-${tabName}`);
-    if (tabElement) {
-        tabElement.classList.add('active');
-    }
-
-    // Find and activate the button
-    const buttons = document.querySelectorAll('.tab');
-    buttons.forEach(btn => {
-        const tabType = btn.getAttribute('data-tab-type');
-
-        if (tabType === 'home' && tabName === 'home') {
-            btn.classList.add('active');
-        } else if (tabType === 'anime' && tabName === 'anime') {
-            // Static anime tab
-            btn.classList.add('active');
-        } else if (tabType === 'series' && tabName === 'series') {
-            // Static series tab
-            btn.classList.add('active');
-        } else if (tabType === 'providers' && tabName === 'providers') {
-            // Static providers tab
-            btn.classList.add('active');
-        } else if (tabType === 'anime' && btn.getAttribute('data-provider') === tabName.replace('anime-', '')) {
-            btn.classList.add('active');
-        } else if (tabType === 'series' && btn.getAttribute('data-provider') === tabName.replace('series-', '')) {
-            btn.classList.add('active');
-        }
-    });
-
-    // Load home content when switching to home tab
-    if (tabName === 'home') {
-        // Content is already loaded on init, but you can reload if needed
-        if (typeof loadHomeContent === 'function' && !document.getElementById('recommendationsList').hasChildNodes()) {
-            loadHomeContent();
-        }
-    }
-
-    // Load watchlist content when switching to watchlist tab
-    if (tabName === 'watchlist') {
-        if (typeof loadSchedulerStatus === 'function') {
-            loadSchedulerStatus();
-        }
-        if (typeof displayWatchlist === 'function') {
-            displayWatchlist();
-        }
-    }
+    console.log('Switching tab to:', tabName);
+    window.dispatchEvent(new CustomEvent('set-tab', { detail: { tab: tabName } }));
 }
 
 
diff --git a/templates/base.html b/templates/base.html
index 1ebfa6c..002cb85 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,7 +23,6 @@
     <script src="/static/js/anime-details.js?v=1.12" defer></script>
     <script src="/static/js/series-search.js?v=1.11" defer></script>
     <script src="/static/js/recommendations.js?v=1.11" defer></script>
-    <script src="/static/js/tabs.js?v=1.11" defer></script>
     <script src="/static/js/watchlist.js?v=1.11" defer></script>
     <script src="/static/js/watchlist-ui.js?v=1.11" defer></script>
     <script src="/static/js/main.js?v=1.11" defer></script>
diff --git a/templates/components/header.html b/templates/components/header.html
index 44d13ad..d2d6609 100644
--- a/templates/components/header.html
+++ b/templates/components/header.html
@@ -26,9 +26,8 @@
     <p style="color: #00d9ff; margin: 0 0 10px 0;">👋 Bienvenue! <a href="/login" style="color: #00d9ff; text-decoration: underline;">Connectez-vous</a> pour télécharger des vidéos</p>
 </div>
 
-<!-- Tabs - Shown only when authenticated -->
-<div id="mainTabs" class="tabs" x-show="isAuthenticated" x-cloak style="visibility: visible;">
-    <button class="tab" :class="{ 'active': activeTab === 'home' }" @click="activeTab = 'home'">
+<div id="mainTabs" class="tabs" x-show="isAuthenticated" x-cloak style="visibility: visible; display: flex;">
+    <button class="tab" :class="{ 'active': activeTab === 'home' }" @click="activeTab = 'home'; if (typeof loadHomeContent === 'function') loadHomeContent()">
         <svg style="width:16px;height:16px;vertical-align:middle;margin-right:5px" fill="none" stroke="currentColor" viewBox="0 0 24 24">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"></path>
         </svg>
diff --git a/templates/components/home_section.html b/templates/components/home_section.html
index 88aee1f..a77c5fd 100644
--- a/templates/components/home_section.html
+++ b/templates/components/home_section.html
@@ -1,5 +1,5 @@
 <!-- Home Section: Recommendations & Latest Releases -->
-<div id="tab-home" class="tab-content active">
+<div id="tab-home" class="tab-content" x-show="activeTab === 'home'" x-init="if (activeTab === 'home') loadHomeContent()">
     <!-- Loading State -->
     <div id="homeLoading" class="loading-spinner">Chargement des recommandations...</div>
 
diff --git a/tests/e2e/test_navigation.py b/tests/e2e/test_navigation.py
new file mode 100644
index 0000000..5c8e80a
--- /dev/null
+++ b/tests/e2e/test_navigation.py
@@ -0,0 +1,41 @@
+import pytest
+from playwright.sync_api import Page, expect
+
+# Since we don't have a full running environment with auth easily mockable in pure Python Playwright 
+# without starting the server, I will write a test that can be run if the server is up.
+# For CI/CD, we'd use a fixture to start the uvicorn server.
+
+@pytest.mark.skip(reason="Requires running server and complex auth mock")
+def test_tab_navigation(page: Page):
+    # Navigate to the app
+    page.goto("http://localhost:3000/web")
+    
+    # Mock authentication state in localStorage and Alpine
+    page.evaluate("""() => {
+        localStorage.setItem('auth_token', 'mock-token');
+        document.body.__x.$data.isAuthenticated = true;
+        document.body.__x.$data.username = 'TestUser';
+    }""")
+    
+    # Reload or wait for Alpine to react
+    page.reload()
+    
+    # Verify Home tab is active by default
+    expect(page.locator("#tab-home")).to_be_visible()
+    expect(page.locator("button.tab:has-text('Accueil')")).to_have_class(/active/)
+    
+    # Click on Anime tab
+    page.click("button.tab:has-text('Anime')")
+    
+    # Verify Anime tab is shown and Home is hidden
+    expect(page.locator("#tab-anime")).to_be_visible()
+    expect(page.locator("#tab-home")).to_be_hidden()
+    expect(page.locator("button.tab:has-text('Anime')")).to_have_class(/active/)
+    
+    # Click on Watchlist tab
+    page.click("button.tab:has-text('Watchlist')")
+    
+    # Verify Watchlist tab is shown
+    expect(page.locator("#tab-watchlist")).to_be_visible()
+    expect(page.locator("#tab-anime")).to_be_hidden()
+    expect(page.locator("button.tab:has-text('Watchlist')")).to_have_class(/active/)