diff --git a/Moonlight/App/Services/Background/CleanupService.cs b/Moonlight/App/Services/Background/CleanupService.cs
index a2018739..966188b9 100644
--- a/Moonlight/App/Services/Background/CleanupService.cs
+++ b/Moonlight/App/Services/Background/CleanupService.cs
@@ -46,13 +46,11 @@ public class CleanupService
         
         var config = ConfigService.GetSection("Moonlight").GetSection("Cleanup");
 
-        /*
-         * if (!config.GetValue<bool>("Enable") || ConfigService.DebugMode)
+        if (!config.GetValue<bool>("Enable") || ConfigService.DebugMode)
         {
             Logger.Info("Disabling cleanup service");
             return;
         }
-         */
         
         Timer = new(TimeSpan.FromMinutes(config.GetValue<int>("Wait")));
 
diff --git a/Moonlight/Shared/Layouts/MainLayout.razor b/Moonlight/Shared/Layouts/MainLayout.razor
index f9dd8de0..19b5e254 100644
--- a/Moonlight/Shared/Layouts/MainLayout.razor
+++ b/Moonlight/Shared/Layouts/MainLayout.razor
@@ -40,116 +40,120 @@
     }
 }
 
-<CascadingValue Value="User">
-    <PageTitle>@(string.IsNullOrEmpty(title) ? "Dashboard - " : title)Moonlight</PageTitle>
+<GlobalErrorBoundary>
+    <CascadingValue Value="User">
+        <PageTitle>@(string.IsNullOrEmpty(title) ? "Dashboard - " : title)Moonlight</PageTitle>
 
-    <div class="d-flex flex-column flex-root app-root" id="kt_app_root">
-        <div class="app-page flex-column flex-column-fluid" id="kt_app_page">
-            <canvas id="snow" class="snow-canvas"></canvas>
+        <div class="d-flex flex-column flex-root app-root" id="kt_app_root">
+            <div class="app-page flex-column flex-column-fluid" id="kt_app_page">
+                <canvas id="snow" class="snow-canvas"></canvas>
 
-            @{
-                //TODO: Add a way to disable the snow
-            }
+                @{
+                    //TODO: Add a way to disable the snow
+                }
 
-            <PageHeader></PageHeader>
-            <div class="app-wrapper flex-column flex-row-fluid" id="kt_app_wrapper">
-                <Sidebar></Sidebar>
-                <div class="app-main flex-column flex-row-fluid" id="kt_app_main">
-                    <div class="d-flex flex-column flex-column-fluid">
-                        <div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: url('@(DynamicBackgroundService.BackgroundImageUrl)')">
-                            <div id="kt_app_content_container" class="app-container container-fluid">
-                                <div class="mt-10">
-                                    @if (!IsIpBanned)
-                                    {
-                                        if (UserProcessed)
-                                        {
-                                            if (uri.LocalPath != "/login" &&
-                                                uri.LocalPath != "/passwordreset" &&
-                                                uri.LocalPath != "/register")
+                <PageHeader></PageHeader>
+                <div class="app-wrapper flex-column flex-row-fluid" id="kt_app_wrapper">
+                    <Sidebar></Sidebar>
+                    <div class="app-main flex-column flex-row-fluid" id="kt_app_main">
+                        <div class="d-flex flex-column flex-column-fluid">
+                            <div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: url('@(DynamicBackgroundService.BackgroundImageUrl)')">
+                                <div id="kt_app_content_container" class="app-container container-fluid">
+                                    <div class="mt-10">
+                                        <SoftErrorBoundary>
+                                            @if (!IsIpBanned)
                                             {
-                                                if (User == null)
+                                                if (UserProcessed)
                                                 {
-                                                    <Login></Login>
-                                                }
-                                                else
-                                                {
-                                                    if (User.Status == UserStatus.Banned)
+                                                    if (uri.LocalPath != "/login" &&
+                                                        uri.LocalPath != "/passwordreset" &&
+                                                        uri.LocalPath != "/register")
                                                     {
-                                                        <BannedAlert></BannedAlert>
-                                                    }
-                                                    else if (User.Status == UserStatus.Disabled)
-                                                    {
-                                                        <DisabledAlert></DisabledAlert>
-                                                    }
-                                                    else if (User.Status == UserStatus.PasswordPending)
-                                                    {
-                                                        <PasswordChangeView></PasswordChangeView>
-                                                    }
-                                                    else if (User.Status == UserStatus.DataPending)
-                                                    {
-                                                        <UserDataSetView></UserDataSetView>
+                                                        if (User == null)
+                                                        {
+                                                            <Login></Login>
+                                                        }
+                                                        else
+                                                        {
+                                                            if (User.Status == UserStatus.Banned)
+                                                            {
+                                                                <BannedAlert></BannedAlert>
+                                                            }
+                                                            else if (User.Status == UserStatus.Disabled)
+                                                            {
+                                                                <DisabledAlert></DisabledAlert>
+                                                            }
+                                                            else if (User.Status == UserStatus.PasswordPending)
+                                                            {
+                                                                <PasswordChangeView></PasswordChangeView>
+                                                            }
+                                                            else if (User.Status == UserStatus.DataPending)
+                                                            {
+                                                                <UserDataSetView></UserDataSetView>
+                                                            }
+                                                            else
+                                                            {
+                                                                @Body
+
+                                                                <RatingPopup/>
+                                                            }
+                                                        }
                                                     }
                                                     else
                                                     {
-                                                        @Body
-
-                                                        <RatingPopup/>
+                                                        if (uri.LocalPath == "/login")
+                                                        {
+                                                            <Login></Login>
+                                                        }
+                                                        else if (uri.LocalPath == "/register")
+                                                        {
+                                                            <Register></Register>
+                                                        }
+                                                        else if (uri.LocalPath == "/passwordreset")
+                                                        {
+                                                            <PasswordReset></PasswordReset>
+                                                        }
                                                     }
                                                 }
+                                                else
+                                                {
+                                                    <div class="modal d-block">
+                                                        <div class="modal-dialog modal-dialog-centered mw-900px">
+                                                            <div class="modal-content">
+                                                                <div class="pt-2 modal-body py-lg-10 px-lg-10">
+                                                                    <h2>@(SmartTranslateService.Translate("Authenticating"))...</h2>
+                                                                    <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Verifying token, loading user data"))</p>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                }
                                             }
                                             else
                                             {
-                                                if (uri.LocalPath == "/login")
-                                                {
-                                                    <Login></Login>
-                                                }
-                                                else if (uri.LocalPath == "/register")
-                                                {
-                                                    <Register></Register>
-                                                }
-                                                else if (uri.LocalPath == "/passwordreset")
-                                                {
-                                                    <PasswordReset></PasswordReset>
-                                                }
-                                            }
-                                        }
-                                        else
-                                        {
-                                            <div class="modal d-block">
-                                                <div class="modal-dialog modal-dialog-centered mw-900px">
-                                                    <div class="modal-content">
-                                                        <div class="pt-2 modal-body py-lg-10 px-lg-10">
-                                                            <h2>@(SmartTranslateService.Translate("Authenticating"))...</h2>
-                                                            <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Verifying token, loading user data"))</p>
+                                                <div class="modal d-block">
+                                                    <div class="modal-dialog modal-dialog-centered mw-900px">
+                                                        <div class="modal-content">
+                                                            <div class="pt-2 modal-body py-lg-10 px-lg-10">
+                                                                <h2>@(SmartTranslateService.Translate("Your ip has been banned"))</h2>
+                                                                <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Your ip address has been banned by an admin"))</p>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </div>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <div class="modal d-block">
-                                            <div class="modal-dialog modal-dialog-centered mw-900px">
-                                                <div class="modal-content">
-                                                    <div class="pt-2 modal-body py-lg-10 px-lg-10">
-                                                        <h2>@(SmartTranslateService.Translate("Your ip has been banned"))</h2>
-                                                        <p class="mt-3 fw-normal fs-6">@(SmartTranslateService.Translate("Your ip address has been banned by an admin"))</p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    }
+                                            }
+                                        </SoftErrorBoundary>
+                                    </div>
                                 </div>
                             </div>
                         </div>
+                        <Footer></Footer>
                     </div>
-                    <Footer></Footer>
                 </div>
             </div>
         </div>
-    </div>
-</CascadingValue>
+    </CascadingValue>
+</GlobalErrorBoundary>
 
 @code
 {
diff --git a/Moonlight/wwwroot/assets/media/gif/loading.gif b/Moonlight/wwwroot/assets/media/gif/loading.gif
new file mode 100644
index 00000000..a718bd89
Binary files /dev/null and b/Moonlight/wwwroot/assets/media/gif/loading.gif differ