diff --git a/src/PowderCoating.Web/Controllers/DiagnosticsController.cs b/src/PowderCoating.Web/Controllers/DiagnosticsController.cs
index 13167bb..b92be76 100644
--- a/src/PowderCoating.Web/Controllers/DiagnosticsController.cs
+++ b/src/PowderCoating.Web/Controllers/DiagnosticsController.cs
@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using PowderCoating.Shared.Constants;
 using System.Reflection;
 using System.Security.Principal;
 
 namespace PowderCoating.Web.Controllers;
 
-[Authorize(Roles = "SuperAdmin,Administrator")]
+[Authorize(Policy = AppConstants.Policies.SuperAdminOnly)]
 public class DiagnosticsController : Controller
 {
     private readonly ILogger<DiagnosticsController> _logger;
diff --git a/src/PowderCoating.Web/Views/DataExport/Index.cshtml b/src/PowderCoating.Web/Views/DataExport/Index.cshtml
index 9d48d5f..b53bd9f 100644
--- a/src/PowderCoating.Web/Views/DataExport/Index.cshtml
+++ b/src/PowderCoating.Web/Views/DataExport/Index.cshtml
@@ -29,6 +29,11 @@
 }
 
 <div class="container-fluid py-3">
+    <div class="mb-2">
+        <a asp-controller="PlatformAdmin" asp-action="Maintenance" class="text-muted small text-decoration-none">
+            <i class="bi bi-arrow-left me-1"></i>Maintenance
+        </a>
+    </div>
     <div class="d-flex align-items-center justify-content-between mb-3">
         <div>
             <h4 class="mb-0"><i class="bi bi-file-earmark-arrow-down me-2 text-primary"></i>Data Export</h4>
diff --git a/src/PowderCoating.Web/Views/DataPurge/Index.cshtml b/src/PowderCoating.Web/Views/DataPurge/Index.cshtml
index 07f1c24..cbecb3d 100644
--- a/src/PowderCoating.Web/Views/DataPurge/Index.cshtml
+++ b/src/PowderCoating.Web/Views/DataPurge/Index.cshtml
@@ -34,6 +34,11 @@
 }
 
 <div class="container-fluid py-3">
+    <div class="mb-2">
+        <a asp-controller="PlatformAdmin" asp-action="Maintenance" class="text-muted small text-decoration-none">
+            <i class="bi bi-arrow-left me-1"></i>Maintenance
+        </a>
+    </div>
     <div class="d-flex align-items-center justify-content-between mb-3">
         <div>
             <h4 class="mb-0"><i class="bi bi-trash3 me-2 text-danger"></i>Data Purge &amp; Cleanup</h4>
diff --git a/src/PowderCoating.Web/Views/SeedData/Index.cshtml b/src/PowderCoating.Web/Views/SeedData/Index.cshtml
index da42fd9..fd459e9 100644
--- a/src/PowderCoating.Web/Views/SeedData/Index.cshtml
+++ b/src/PowderCoating.Web/Views/SeedData/Index.cshtml
@@ -18,7 +18,11 @@
 }
 
 <div class="container-fluid">
-    <div class="mb-4"></div>
+    <div class="mb-2">
+        <a asp-controller="PlatformAdmin" asp-action="Maintenance" class="text-muted small text-decoration-none">
+            <i class="bi bi-arrow-left me-1"></i>Maintenance
+        </a>
+    </div>
 
     @if (TempData["SuccessMessage"] != null)
     {
diff --git a/src/PowderCoating.Web/Views/StorageMigration/Index.cshtml b/src/PowderCoating.Web/Views/StorageMigration/Index.cshtml
index 82e2e86..64fb795 100644
--- a/src/PowderCoating.Web/Views/StorageMigration/Index.cshtml
+++ b/src/PowderCoating.Web/Views/StorageMigration/Index.cshtml
@@ -6,6 +6,11 @@
 }
 
 <div class="container-fluid">
+    <div class="mb-2">
+        <a asp-controller="PlatformAdmin" asp-action="Maintenance" class="text-muted small text-decoration-none">
+            <i class="bi bi-arrow-left me-1"></i>Maintenance
+        </a>
+    </div>
 
     <div class="row g-4">
         <!-- Status Card -->