diff --git a/CouchLog/Components/Account/Pages/Register.razor b/CouchLog/Components/Account/Pages/Register.razor
index f5e6afc..8ca9662 100644
--- a/CouchLog/Components/Account/Pages/Register.razor
+++ b/CouchLog/Components/Account/Pages/Register.razor
@@ -1,4 +1,5 @@
 ﻿@page "/Account/Register"
+@layout Layout.IdentityLayout
 
 @using System.ComponentModel.DataAnnotations
 @using System.Text
diff --git a/CouchLog/Components/App.razor b/CouchLog/Components/App.razor
index bd8f6be..285088e 100644
--- a/CouchLog/Components/App.razor
+++ b/CouchLog/Components/App.razor
@@ -6,7 +6,9 @@
         <base href="/" />
         <link rel="stylesheet" href="@Assets["CouchLog.styles.css"]" />
         <ImportMap />
-        <HeadOutlet />
+        
+        @* Rendermode get's hand over dynamic *@
+        <HeadOutlet @rendermode="RenderModeForPage" />
 
         <!-- #MudBlazor -->
         <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
@@ -15,8 +17,16 @@
     </head>
 
     <body>
-        <Routes/>
+        @* Rendermode get's hand over dynamic *@
+        <Routes @rendermode="RenderModeForPage" />
         <script src="_framework/blazor.web.js"></script>
         <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     </body>
 </html>
+
+@code {
+    [CascadingParameter]
+    private HttpContext HttpContext { get; set; } = default!;
+
+    private Microsoft.AspNetCore.Components.IComponentRenderMode? RenderModeForPage => HttpContext.Request.Path.StartsWithSegments("/Account") ? null : Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer;
+}
diff --git a/CouchLog/Components/Layout/IdentityLayout.razor b/CouchLog/Components/Layout/IdentityLayout.razor
index f87c497..d82b246 100644
--- a/CouchLog/Components/Layout/IdentityLayout.razor
+++ b/CouchLog/Components/Layout/IdentityLayout.razor
@@ -1,8 +1,7 @@
 @inherits LayoutComponentBase
 @using MudBlazor
 
-@* Die Provider sind wichtig, um die CSS-Styles (Themes, Farben) von MudBlazor zu laden *@
-<MudThemeProvider />
+<MudThemeProvider IsDarkMode="true" />
 <MudDialogProvider />
 <MudSnackbarProvider />
 
@@ -12,4 +11,4 @@
             @Body
         </MudContainer>
     </MudMainContent>
-</MudLayout>
+</MudLayout>
\ No newline at end of file
diff --git a/CouchLog/Components/Layout/MainLayout.razor b/CouchLog/Components/Layout/MainLayout.razor
index ffb846e..bde8d35 100644
--- a/CouchLog/Components/Layout/MainLayout.razor
+++ b/CouchLog/Components/Layout/MainLayout.razor
@@ -1,9 +1,10 @@
 ﻿@inherits LayoutComponentBase
 @using MudBlazor
 
-<MudThemeProvider />
+<MudThemeProvider @bind-IsDarkMode="@_isDarkMode" />
 <MudDialogProvider />
 <MudSnackbarProvider />
+<MudPopoverProvider />
 
 <MudLayout>
     <MudAppBar Color="Color.Primary" Fixed="true">
@@ -12,7 +13,7 @@
     </MudAppBar>
 
     <MudDrawer @bind-Open="@_drawerOpen" ClipMode="DrawerClipMode.Always" Elevation="1">
-        <NavMenu /> @* Ihr NavMenu.razor müssen Sie später auch auf MudNavMenu umbauen *@
+        <NavMenu />
     </MudDrawer>
 
     <MudMainContent>
@@ -30,9 +31,10 @@
 
 @code {
     bool _drawerOpen = true;
+    bool _isDarkMode = true;
 
     void DrawerToggle()
     {
         _drawerOpen = !_drawerOpen;
     }
-}
+}
\ No newline at end of file
diff --git a/CouchLog/Components/Pages/Error.razor b/CouchLog/Components/Pages/Error.razor
index 576cc2d..b9818ce 100644
--- a/CouchLog/Components/Pages/Error.razor
+++ b/CouchLog/Components/Pages/Error.razor
@@ -33,4 +33,4 @@
 
     protected override void OnInitialized() =>
         RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier;
-}
+}
\ No newline at end of file
diff --git a/CouchLog/Components/Pages/GlobalList.razor b/CouchLog/Components/Pages/GlobalList.razor
index 9b3eda0..e7ae57a 100644
--- a/CouchLog/Components/Pages/GlobalList.razor
+++ b/CouchLog/Components/Pages/GlobalList.razor
@@ -15,6 +15,22 @@
 
 <PageTitle>GlobalList</PageTitle>
 
+<MudContainer>
+    @*Top of the Page*@
+    <MudStack Row="true" AlignItems="AlignItems.Center">
+        @*Page Title*@
+        <MudText Typo="Typo.h2" Style="font-weight: bold;">Global List</MudText>
+        
+        @*Spacer*@
+        <MudSpacer />
+
+        @*Button for adding GlobalEntity*@
+        <MudTooltip Text="Add GlobalEntity">
+            <MudFab StartIcon="@Icons.Material.Filled.Add" Color="Color.Primary"/>
+        </MudTooltip>
+    </MudStack>
+</MudContainer>
+
 <div class="container-fluid mt-4">
     <!-- #region CreateEntity -->
     <div class="d-flex justify-content-between align-items-center mb-4">
diff --git a/CouchLog/Components/Pages/Home.razor b/CouchLog/Components/Pages/Home.razor
index b31f023..723e536 100644
--- a/CouchLog/Components/Pages/Home.razor
+++ b/CouchLog/Components/Pages/Home.razor
@@ -1,6 +1,6 @@
 ﻿@page "/"
-@rendermode InteractiveServer
 
+@using CouchLog.Components.Layout
 @using Microsoft.AspNetCore.Authorization
 
 @attribute [Authorize]
@@ -9,4 +9,4 @@
 
 <h1>Hello, world!</h1>
 
-Welcome to your new app.
+Welcome to your new app.
\ No newline at end of file
diff --git a/CouchLog/Components/Routes.razor b/CouchLog/Components/Routes.razor
index c4e9068..eabc9b4 100644
--- a/CouchLog/Components/Routes.razor
+++ b/CouchLog/Components/Routes.razor
@@ -8,4 +8,4 @@
         </AuthorizeRouteView>
         <FocusOnNavigate RouteData="routeData" Selector="h1" />
     </Found>
-</Router>
+</Router>
\ No newline at end of file
