diff --git a/frontend/src/app.rs b/frontend/src/app.rs
index d6473a4..eb82420 100644
--- a/frontend/src/app.rs
+++ b/frontend/src/app.rs
@@ -12,6 +12,15 @@ use leptos_shadcn_toast::SonnerProvider;
 
 #[component]
 pub fn App() -> impl IntoView {
+    view! {
+        <SonnerProvider>
+            <InnerApp />
+        </SonnerProvider>
+    }
+}
+
+#[component]
+fn InnerApp() -> impl IntoView {
     crate::store::provide_torrent_store();
     let store = use_context::<crate::store::TorrentStore>();
 
@@ -70,126 +79,124 @@ pub fn App() -> impl IntoView {
     });
 
     view! {
-        <SonnerProvider>
-            <div class="relative w-full h-screen" style="height: 100dvh;">
-                <Router>
-                    <Routes fallback=|| view! { <div class="p-4">"404 Not Found"</div> }>
-                        <Route path=leptos_router::path!("/login") view=move || {
-                            let authenticated = is_authenticated.0.get();
-                            let setup_needed = needs_setup.0.get();
-                            
-                            Effect::new(move |_| {
-                                if setup_needed {
-                                    let navigate = use_navigate();
+        <div class="relative w-full h-screen" style="height: 100dvh;">
+            <Router>
+                <Routes fallback=|| view! { <div class="p-4">"404 Not Found"</div> }>
+                    <Route path=leptos_router::path!("/login") view=move || {
+                        let authenticated = is_authenticated.0.get();
+                        let setup_needed = needs_setup.0.get();
+                        
+                        Effect::new(move |_| {
+                            if setup_needed {
+                                let navigate = use_navigate();
+                                navigate("/setup", Default::default());
+                            } else if authenticated {
+                                log::info!("Already authenticated, redirecting to home");
+                                let navigate = use_navigate();
+                                navigate("/", Default::default());
+                            }
+                        });
+                        
+                        view! { <Login /> }
+                    } />
+                    <Route path=leptos_router::path!("/setup") view=move || {
+                        Effect::new(move |_| {
+                            if is_authenticated.0.get() {
+                                let navigate = use_navigate();
+                                navigate("/", Default::default());
+                            }
+                        });
+                        
+                        view! { <Setup /> }
+                    } />
+
+                    <Route path=leptos_router::path!("/") view=move || {
+                        let navigate = use_navigate();
+                        Effect::new(move |_| {
+                            if !is_loading.0.get() {
+                                if needs_setup.0.get() {
+                                    log::info!("Setup not completed, redirecting to setup");
                                     navigate("/setup", Default::default());
-                                } else if authenticated {
-                                    log::info!("Already authenticated, redirecting to home");
-                                    let navigate = use_navigate();
-                                    navigate("/", Default::default());
-                                }
-                            });
-                            
-                            view! { <Login /> }
-                        } />
-                        <Route path=leptos_router::path!("/setup") view=move || {
-                            Effect::new(move |_| {
-                                if is_authenticated.0.get() {
-                                    let navigate = use_navigate();
-                                    navigate("/", Default::default());
-                                }
-                            });
-                            
-                            view! { <Setup /> }
-                        } />
-
-                        <Route path=leptos_router::path!("/") view=move || {
-                            let navigate = use_navigate();
-                            Effect::new(move |_| {
-                                if !is_loading.0.get() {
-                                    if needs_setup.0.get() {
-                                        log::info!("Setup not completed, redirecting to setup");
-                                        navigate("/setup", Default::default());
-                                    } else if !is_authenticated.0.get() {
-                                        log::info!("Not authenticated, redirecting to login");
-                                        navigate("/login", Default::default());
-                                    }
-                                }
-                            });
-                            
-                            view! {
-                                <Show when=move || !is_loading.0.get() fallback=|| view! {
-                                    <div class="flex h-screen bg-background">
-                                        // Sidebar skeleton
-                                        <div class="w-56 border-r border-border p-4 space-y-4">
-                                            <Skeleton class="h-8 w-3/4" />
-                                            <div class="space-y-2">
-                                                <Skeleton class="h-6 w-full" />
-                                                <Skeleton class="h-6 w-full" />
-                                                <Skeleton class="h-6 w-4/5" />
-                                                <Skeleton class="h-6 w-full" />
-                                                <Skeleton class="h-6 w-3/5" />
-                                                <Skeleton class="h-6 w-full" />
-                                            </div>
-                                        </div>
-                                        // Main content skeleton
-                                        <div class="flex-1 flex flex-col">
-                                            // Header skeleton
-                                            <div class="border-b border-border p-4 flex items-center gap-4">
-                                                <Skeleton class="h-8 w-48" />
-                                                <Skeleton class="h-8 w-64" />
-                                                <div class="ml-auto"><Skeleton class="h-8 w-24" /></div>
-                                            </div>
-                                            // Table skeleton rows
-                                            <div class="flex-1 p-4 space-y-3">
-                                                <Skeleton class="h-10 w-full" />
-                                                <Skeleton class="h-10 w-full" />
-                                                <Skeleton class="h-10 w-full" />
-                                                <Skeleton class="h-10 w-full" />
-                                                <Skeleton class="h-10 w-full" />
-                                                <Skeleton class="h-10 w-3/4" />
-                                            </div>
-                                            // Status bar skeleton
-                                            <div class="border-t border-border p-3">
-                                                <Skeleton class="h-5 w-96" />
-                                            </div>
-                                        </div>
-                                    </div>
-                                }.into_any()>
-                                    <Show when=move || is_authenticated.0.get() fallback=|| ()>
-                                        <Protected>
-                                            <div class="flex flex-col h-full overflow-hidden">
-                                                <div class="flex-1 overflow-hidden">
-                                                    <TorrentTable />
-                                                </div>
-                                                <TorrentDetail />
-                                            </div>
-                                        </Protected>
-                                    </Show>
-                                </Show>
-                            }.into_any()
-                        }/>
-
-                        <Route path=leptos_router::path!("/settings") view=move || {
-                            Effect::new(move |_| {
-                                if !is_authenticated.0.get() {
-                                    let navigate = use_navigate();
+                                } else if !is_authenticated.0.get() {
+                                    log::info!("Not authenticated, redirecting to login");
                                     navigate("/login", Default::default());
                                 }
-                            });
-                            
-                            view! {
-                                <Show when=move || !is_loading.0.get() fallback=|| ()>
-                                    <Show when=move || is_authenticated.0.get() fallback=|| ()>
-                                        <Protected>
-                                            <div class="p-4">"Settings Page (Coming Soon)"</div>
-                                        </Protected>
-                                    </Show>
-                                </Show>
                             }
-                        }/>
-                    </Routes>
-                </Router>
-            </div>
-        </SonnerProvider>
+                        });
+                        
+                        view! {
+                            <Show when=move || !is_loading.0.get() fallback=|| view! {
+                                <div class="flex h-screen bg-background">
+                                    // Sidebar skeleton
+                                    <div class="w-56 border-r border-border p-4 space-y-4">
+                                        <Skeleton class="h-8 w-3/4" />
+                                        <div class="space-y-2">
+                                            <Skeleton class="h-6 w-full" />
+                                            <Skeleton class="h-6 w-full" />
+                                            <Skeleton class="h-6 w-4/5" />
+                                            <Skeleton class="h-6 w-full" />
+                                            <Skeleton class="h-6 w-3/5" />
+                                            <Skeleton class="h-6 w-full" />
+                                        </div>
+                                    </div>
+                                    // Main content skeleton
+                                    <div class="flex-1 flex flex-col">
+                                        // Header skeleton
+                                        <div class="border-b border-border p-4 flex items-center gap-4">
+                                            <Skeleton class="h-8 w-48" />
+                                            <Skeleton class="h-8 w-64" />
+                                            <div class="ml-auto"><Skeleton class="h-8 w-24" /></div>
+                                        </div>
+                                        // Table skeleton rows
+                                        <div class="flex-1 p-4 space-y-3">
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-3/4" />
+                                        </div>
+                                        // Status bar skeleton
+                                        <div class="border-t border-border p-3">
+                                            <Skeleton class="h-5 w-96" />
+                                        </div>
+                                    </div>
+                                </div>
+                            }.into_any()>
+                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
+                                    <Protected>
+                                        <div class="flex flex-col h-full overflow-hidden">
+                                            <div class="flex-1 overflow-hidden">
+                                                <TorrentTable />
+                                            </div>
+                                            <TorrentDetail />
+                                        </div>
+                                    </Protected>
+                                </Show>
+                            </Show>
+                        }.into_any()
+                    }/>
+
+                    <Route path=leptos_router::path!("/settings") view=move || {
+                        Effect::new(move |_| {
+                            if !is_authenticated.0.get() {
+                                let navigate = use_navigate();
+                                navigate("/login", Default::default());
+                            }
+                        });
+                        
+                        view! {
+                            <Show when=move || !is_loading.0.get() fallback=|| ()>
+                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
+                                    <Protected>
+                                        <div class="p-4">"Settings Page (Coming Soon)"</div>
+                                    </Protected>
+                                </Show>
+                            </Show>
+                        }
+                    }/>
+                </Routes>
+            </Router>
+        </div>
     }
 }