diff --git a/WebApp/Components/Layout/EmptyLayout.razor b/WebApp/Components/Layout/EmptyLayout.razor
new file mode 100644
index 0000000..913137b
--- /dev/null
+++ b/WebApp/Components/Layout/EmptyLayout.razor
@@ -0,0 +1,7 @@
+@inherits LayoutComponentBase
+
+<MudThemeProvider Theme="CustomThemes.Ceruleantheme" />
+<MudPopoverProvider />
+<MudDialogProvider />
+
+@Body
diff --git a/WebApp/Components/Login.razor b/WebApp/Components/Login.razor
index 1c8a88a..9e1a17d 100644
--- a/WebApp/Components/Login.razor
+++ b/WebApp/Components/Login.razor
@@ -1,4 +1,6 @@
 @page "/login"
+@using WebApp.Components.Layout
+@layout EmptyLayout
 @using System.ComponentModel.DataAnnotations
 @using WebApp.Authentication
 @inject NavigationManager Navigation
diff --git a/WebApp/Components/CrudActions.razor b/WebApp/Components/Shared/CrudActions.razor
similarity index 100%
rename from WebApp/Components/CrudActions.razor
rename to WebApp/Components/Shared/CrudActions.razor
diff --git a/WebApp/Components/Pages/EventAttributes.razor b/WebApp/Components/Shared/EventAttributes.razor
similarity index 100%
rename from WebApp/Components/Pages/EventAttributes.razor
rename to WebApp/Components/Shared/EventAttributes.razor
diff --git a/WebApp/Components/StudentTextBoxSelector.razor b/WebApp/Components/Shared/StudentTextBoxSelector.razor
similarity index 100%
rename from WebApp/Components/StudentTextBoxSelector.razor
rename to WebApp/Components/Shared/StudentTextBoxSelector.razor
diff --git a/WebApp/Components/StudentToggleSelector.razor b/WebApp/Components/Shared/StudentToggleSelector.razor
similarity index 100%
rename from WebApp/Components/StudentToggleSelector.razor
rename to WebApp/Components/Shared/StudentToggleSelector.razor
diff --git a/WebApp/Components/TeamCaptainSelector.razor b/WebApp/Components/Shared/TeamCaptainSelector.razor
similarity index 100%
rename from WebApp/Components/TeamCaptainSelector.razor
rename to WebApp/Components/Shared/TeamCaptainSelector.razor
diff --git a/WebApp/Components/Pages/TeamSelector.razor b/WebApp/Components/Shared/TeamSelector.razor
similarity index 100%
rename from WebApp/Components/Pages/TeamSelector.razor
rename to WebApp/Components/Shared/TeamSelector.razor
diff --git a/WebApp/Components/Pages/TeamPages/TeamStudents.razor b/WebApp/Components/Shared/TeamStudents.razor
similarity index 100%
rename from WebApp/Components/Pages/TeamPages/TeamStudents.razor
rename to WebApp/Components/Shared/TeamStudents.razor
diff --git a/WebApp/Components/TeamToggleSelector.razor b/WebApp/Components/Shared/TeamToggleSelector.razor
similarity index 97%
rename from WebApp/Components/TeamToggleSelector.razor
rename to WebApp/Components/Shared/TeamToggleSelector.razor
index 0325769..3439d2d 100644
--- a/WebApp/Components/TeamToggleSelector.razor
+++ b/WebApp/Components/Shared/TeamToggleSelector.razor
@@ -1,5 +1,3 @@
-@using WebApp.Components.Pages
-
 @if (Title != null)
 {
     <MudText Typo="Typo.h4">@Title</MudText>
diff --git a/WebApp/Components/_Imports.razor b/WebApp/Components/_Imports.razor
index 3bdd46f..836f976 100644
--- a/WebApp/Components/_Imports.razor
+++ b/WebApp/Components/_Imports.razor
@@ -10,6 +10,7 @@
 @using Microsoft.JSInterop
 @using WebApp
 @using WebApp.Components
+@using WebApp.Components.Shared
 @using MudBlazor
 @using Core.Entities
 @using Data