diff --git a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcAddressesController.cs b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsAddressesController.cs
similarity index 97%
rename from src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcAddressesController.cs
rename to src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsAddressesController.cs
index 9e1f5471..a9d9452a 100644
--- a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcAddressesController.cs
+++ b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsAddressesController.cs
@@ -9,7 +9,7 @@ namespace ghosts.api.Areas.Animator.Controllers.Api
     [ApiController]
     [Produces("application/json")]
     [Route("api/[controller]")]
-    public class NpcAddressesController: ControllerBase
+    public class NpcsAddressesController: ControllerBase
     {
         /// <summary>
         /// Get random addressProfile
diff --git a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcController.cs b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsController.cs
similarity index 98%
rename from src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcController.cs
rename to src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsController.cs
index 862a5f34..3639c2a2 100644
--- a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcController.cs
+++ b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsController.cs
@@ -18,11 +18,11 @@ namespace ghosts.api.Areas.Animator.Controllers.Api;
 [ApiController]
 [Produces("application/json")]
 [Route("api/[controller]")]
-public class NpcController : ControllerBase
+public class NpcsController : ControllerBase
 {
     private readonly ApplicationDbContext _context;
 
-    public NpcController(ApplicationDbContext context)
+    public NpcsController(ApplicationDbContext context)
     {
         _context = context;
     }
diff --git a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcEnclaveController.cs b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsEnclaveController.cs
similarity index 97%
rename from src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcEnclaveController.cs
rename to src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsEnclaveController.cs
index 75f2a542..9f200f08 100644
--- a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcEnclaveController.cs
+++ b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsEnclaveController.cs
@@ -20,11 +20,11 @@ namespace ghosts.api.Areas.Animator.Controllers.Api;
 [ApiController]
 [Produces("application/json")]
 [Route("api/[controller]/{campaign}/{enclave}")]
-public class NpcEnclaveController : ControllerBase
+public class NpcsEnclaveController : ControllerBase
 {
     private readonly ApplicationDbContext _context;
 
-    public NpcEnclaveController(ApplicationDbContext context)
+    public NpcsEnclaveController(ApplicationDbContext context)
     {
         _context = context;
     }
diff --git a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcGenerateController.cs b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsGenerateController.cs
similarity index 97%
rename from src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcGenerateController.cs
rename to src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsGenerateController.cs
index 1174567c..76077a63 100644
--- a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcGenerateController.cs
+++ b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsGenerateController.cs
@@ -24,12 +24,12 @@ namespace ghosts.api.Areas.Animator.Controllers.Api;
 [ApiController]
 [Produces("application/json")]
 [Route("api/[controller]")]
-public class NpcGenerateController : ControllerBase
+public class NpcsGenerateController : ControllerBase
 {
     private static readonly Logger _log = LogManager.GetCurrentClassLogger();
     private readonly ApplicationDbContext _context;
 
-    public NpcGenerateController(ApplicationDbContext context)
+    public NpcsGenerateController(ApplicationDbContext context)
     {
         _context = context;
     }
diff --git a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcInsiderThreatController.cs b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsInsiderThreatController.cs
similarity index 97%
rename from src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcInsiderThreatController.cs
rename to src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsInsiderThreatController.cs
index 07329da3..06cc50db 100644
--- a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcInsiderThreatController.cs
+++ b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsInsiderThreatController.cs
@@ -22,11 +22,11 @@ namespace ghosts.api.Areas.Animator.Controllers.Api;
 [ApiController]
 [Produces("application/json")]
 [Route("api/[controller]")]
-public class NpcInsiderThreatController : ControllerBase
+public class NpcsInsiderThreatController : ControllerBase
 {
     private readonly ApplicationDbContext _context;
         
-    public NpcInsiderThreatController(ApplicationDbContext context)
+    public NpcsInsiderThreatController(ApplicationDbContext context)
     {
         this._context = context;
     }
diff --git a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcTeamController.cs b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsTeamController.cs
similarity index 98%
rename from src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcTeamController.cs
rename to src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsTeamController.cs
index ceddbde1..f557fe3a 100644
--- a/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcTeamController.cs
+++ b/src/Ghosts.Api/Areas/Animator/Controllers/Api/NpcsTeamController.cs
@@ -22,12 +22,12 @@ namespace ghosts.api.Areas.Animator.Controllers.Api;
 [ApiController]
 [Produces("application/json")]
 [Route("api/[controller]")]
-public class NpcTeamController : ControllerBase
+public class NpcsTeamController : ControllerBase
 {
     private static readonly Logger _log = LogManager.GetCurrentClassLogger();
     private readonly ApplicationDbContext _context;
 
-    public NpcTeamController(ApplicationDbContext context)
+    public NpcsTeamController(ApplicationDbContext context)
     {
         this._context = context;
     }
diff --git a/src/Ghosts.Api/Views/Shared/_Layout.cshtml b/src/Ghosts.Api/Views/Shared/_Layout.cshtml
index 55190f89..5fcbed85 100644
--- a/src/Ghosts.Api/Views/Shared/_Layout.cshtml
+++ b/src/Ghosts.Api/Views/Shared/_Layout.cshtml
@@ -1,5 +1,11 @@
-@using System.Net.Mime
 @using Ghosts.Domain.Code
+@{
+   var request = Context.Request;
+   var host = request.Host.Host; // Get the host without port
+   var scheme = request.Scheme; // Get the scheme (http or https)
+   var grafanaUrl = $"{scheme}://{host}:3000"; // Construct the URL with the new port
+}
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -23,9 +29,6 @@
             <a href="@Url.Action("Index", "Home", new { area = "" })?" class="me-lg-3 nav-link">GHOSTS</a>
 
             <ul class="nav">
-                <li class="nav-item">
-                    <a href="/swagger" class="nav-link" target="_blank">API Swagger</a>
-                </li>
                 <li class="nav-item">
                     @Html.ActionLink("Activities", "Index", "ViewActivities", new { Area = "Animator" }, new { @class = "nav-link" })
                 </li>
@@ -48,12 +51,15 @@
 <footer class="py-3 my-4 border-top text-muted small">
     <div class="container text-center text-md-start">
         <div class="row justify-content-between">
-            <div class="col-md-3 col-lg-4 col-xl-3">
-                <p>CERT © 2017. All rights reserved.</p>
+            <div class="col-xl-6 mb-md-0">
+                <p>GHOSTS v<span>@ApplicationDetails.Version</span> (@ApplicationDetails.VersionFile). CERT © 2017. All rights reserved.</p>
             </div>
-            <div class="col-md-4 col-lg-3 col-xl-3 mb-md-0 text-md-end">
+            <div class="col-xl-6 mb-md-0 text-md-end">
                 <p>
-                    GHOSTS v<span>@ApplicationDetails.Version</span> (@ApplicationDetails.VersionFile) | <a href="https://github.com/cmu-sei/GHOSTS" target="_blank" class="link-secondary">GitHub</a> | <a href="https://cmu-sei.github.io/GHOSTS/" target="_blank" class="link-secondary">Docs</a>
+                    <a href="/swagger" class="link-secondary" target="_blank">API Swagger</a> | 
+                    <a href="@grafanaUrl" class="link-secondary" target="_blank">Grafana</a> | 
+                    <a href="https://github.com/cmu-sei/GHOSTS" target="_blank" class="link-secondary">GitHub</a> | 
+                    <a href="https://cmu-sei.github.io/GHOSTS/" target="_blank" class="link-secondary">Docs</a>
                 </p>
             </div>
         </div>