diff --git a/DotBased b/DotBased
index 17f6982..d98634d 160000
--- a/DotBased
+++ b/DotBased
@@ -1 +1 @@
-Subproject commit 17f69824eb3a854be545c3517c8ecd4bb63eab7b
+Subproject commit d98634d8887e0bab7add7f2181c2cdd5db77e1d2
diff --git a/SharpRSS.Blazor/Components/Pages/Error.razor b/SharpRSS.Blazor/Components/Pages/Application/Error.razor
similarity index 100%
rename from SharpRSS.Blazor/Components/Pages/Error.razor
rename to SharpRSS.Blazor/Components/Pages/Application/Error.razor
diff --git a/SharpRSS.Blazor/Components/Pages/Auth/Login.razor b/SharpRSS.Blazor/Components/Pages/Application/Login.razor
similarity index 94%
rename from SharpRSS.Blazor/Components/Pages/Auth/Login.razor
rename to SharpRSS.Blazor/Components/Pages/Application/Login.razor
index 9ae2b97..4ea1d84 100644
--- a/SharpRSS.Blazor/Components/Pages/Auth/Login.razor
+++ b/SharpRSS.Blazor/Components/Pages/Application/Login.razor
@@ -1,7 +1,6 @@
 @page "/Auth/Login"
 @using SharpRSS.Blazor.Extensions
 @inject NavigationManager NavigationManager
-@attribute [AllowAnonymous]
 
 <PageTitle>Login | SharpRSS</PageTitle>
 
diff --git a/SharpRSS.Blazor/Components/Pages/Application/_Imports.razor b/SharpRSS.Blazor/Components/Pages/Application/_Imports.razor
new file mode 100644
index 0000000..f7fc82e
--- /dev/null
+++ b/SharpRSS.Blazor/Components/Pages/Application/_Imports.razor
@@ -0,0 +1,6 @@
+@layout EmptyLayout
+@attribute [AllowAnonymous]
+
+@code {
+    
+}
\ No newline at end of file
diff --git a/SharpRSS.Blazor/Components/Pages/_Imports.razor b/SharpRSS.Blazor/Components/Pages/_Imports.razor
new file mode 100644
index 0000000..1481e51
--- /dev/null
+++ b/SharpRSS.Blazor/Components/Pages/_Imports.razor
@@ -0,0 +1,5 @@
+@layout MainLayout
+
+@code {
+    
+}
\ No newline at end of file
diff --git a/SharpRSS.Blazor/Components/Routes.razor b/SharpRSS.Blazor/Components/Routes.razor
index 0705dc9..c37bd1b 100644
--- a/SharpRSS.Blazor/Components/Routes.razor
+++ b/SharpRSS.Blazor/Components/Routes.razor
@@ -13,9 +13,9 @@
             </AuthorizeRouteView>
         </Found>
         <NotFound>
+            <PageTitle>Not found!</PageTitle>
             <LayoutView Layout="@typeof(EmptyLayout)">
                 @*TODO: Manage not found*@
-                <PageTitle>Not found!</PageTitle>
                 <p>Page not found!</p>
             </LayoutView>
         </NotFound>
diff --git a/SharpRSS.Blazor/Program.cs b/SharpRSS.Blazor/Program.cs
index 9ea8342..04ccea9 100644
--- a/SharpRSS.Blazor/Program.cs
+++ b/SharpRSS.Blazor/Program.cs
@@ -80,6 +80,7 @@ app.UseAntiforgery();
 app.UseBasedServerAuth();
 
 app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
+    .AddInteractiveServerRenderMode()
+    .AllowAnonymous();
 
 app.Run();
\ No newline at end of file