From 751305dfeece65f24317c0110a12e26b1bc5f1d2 Mon Sep 17 00:00:00 2001
From: Tim Hess <tim.hess@broadcom.com>
Date: Tue, 3 Sep 2024 15:53:29 -0500
Subject: [PATCH 1/6] add deprecation notes, more centralized redirects, lots
 of cleanup

also fix titles and meta descriptions
---
 README.md                                     |  10 +-
 src/Client/Components/App.razor               |  67 ++---
 src/Client/Components/Banner.razor            |  24 +-
 src/Client/Components/Breadcrumbs.razor       |  37 ---
 src/Client/Components/CustomPageTitle.razor   |  13 -
 src/Client/Components/GetStarted.razor        |  17 --
 src/Client/Components/Href.razor              |  24 +-
 src/Client/Components/Layout/MainLayout.razor |  35 +--
 src/Client/Components/Layout/SiteFooter.razor | 267 +++++++-----------
 src/Client/Components/Layout/SiteHeader.razor | 135 +++++----
 src/Client/Components/Note.razor              |  29 +-
 .../Pages/AppConfiguration/Cloudfoundry.razor |  23 --
 .../AppConfiguration/GettingStarted.razor     |  24 --
 .../Pages/AppConfiguration/Index.razor        |  88 +++---
 .../Pages/AppConfiguration/Placeholder.razor  |  23 --
 .../Pages/AppConfiguration/Randomvalue.razor  |  23 --
 .../Pages/AppConfiguration/Redirects.razor    |  25 ++
 .../Pages/AppConfiguration/Springconfig.razor |  23 --
 src/Client/Components/Pages/Blog.razor        |  25 +-
 .../Pages/CircuitBreakers/Breaker.razor       |  24 --
 .../Pages/CircuitBreakers/Index.razor         |  77 ++---
 .../Pages/CircuitBreakers/Redirects.razor     |  12 +
 src/Client/Components/Pages/Cloud.razor       |  94 +++---
 src/Client/Components/Pages/Community.razor   |  12 +-
 src/Client/Components/Pages/Doc.razor         |  32 +--
 .../Pages/DynamicLogging/Index.razor          |  27 --
 .../Pages/DynamicLogging/Redirects.razor      |  14 +
 src/Client/Components/Pages/Error.razor       |   3 +-
 .../Components/Pages/Event-Driven.razor       | 108 ++++---
 .../Pages/GenericGuidesRedirect.razor         |  23 ++
 .../Components/Pages/GetStarted/Index.razor   |  17 --
 src/Client/Components/Pages/Home.razor        | 123 +++-----
 .../Components/Pages/Initializr/Index.razor   |  49 ++--
 .../Pages/Management/Endpoints.razor          |  24 --
 .../Management/Endpoints_Framework.razor      |  25 --
 .../Pages/Management/GettingStarted.razor     |  24 --
 .../Components/Pages/Management/Index.razor   |  59 ++--
 .../Components/Pages/Management/Logging.razor |  21 --
 .../Pages/Management/Redirects.razor          |  25 ++
 .../Components/Pages/Management/Tracing.razor |  23 --
 .../Pages/Messaging/GettingStarted.razor      |  24 --
 .../Components/Pages/Messaging/Index.razor    |  75 +++--
 .../Components/Pages/Messaging/Rabbit.razor   |  23 --
 .../Pages/Messaging/Redirects.razor           |  12 +
 .../Components/Pages/Microservices.razor      | 133 ++++-----
 .../Pages/NetworkFileSharing/Index.razor      |  24 --
 .../Pages/NetworkFileSharing/Redirects.razor  |  13 +
 .../Pages/Observability/AppManager.razor      |  24 --
 .../Pages/Observability/Grafana.razor         |  24 --
 .../Pages/Observability/Index.razor           |  22 --
 .../Pages/Observability/Redirects.razor       |  14 +
 .../Pages/Observability/WaveFront.razor       |  24 --
 .../Components/Pages/Security/Credhub.razor   |  23 --
 .../Pages/Security/GettingStarted.razor       |  24 --
 .../Components/Pages/Security/Index.razor     |  95 ++++---
 .../Components/Pages/Security/Jwt.razor       |  24 --
 .../Components/Pages/Security/Redirects.razor |  27 ++
 .../Pages/Security/Redisstore.razor           |  23 --
 .../Components/Pages/Security/Sso_OAuth.razor |  23 --
 .../Pages/Security/Sso_OpenID.razor           |  25 --
 .../Pages/Security/Sso_OpenID_Framework.razor |  23 --
 .../Pages/ServiceConnectors/Gemfire.razor     |  23 --
 .../ServiceConnectors/GettingStarted.razor    |  24 --
 .../Pages/ServiceConnectors/Index.razor       |  80 +++---
 .../Pages/ServiceConnectors/Mongo.razor       |  24 --
 .../Pages/ServiceConnectors/Mssql.razor       |  24 --
 .../Pages/ServiceConnectors/Mysql.razor       |  23 --
 .../Pages/ServiceConnectors/Oauth.razor       |  24 --
 .../Pages/ServiceConnectors/Postgresql.razor  |  23 --
 .../Pages/ServiceConnectors/Rabbit.razor      |  23 --
 .../Pages/ServiceConnectors/Redirects.razor   |  23 ++
 .../Pages/ServiceConnectors/Redis.razor       |  23 --
 .../Pages/ServiceDiscovery/Consul.razor       |  23 --
 .../Pages/ServiceDiscovery/Eureka.razor       |  23 --
 .../ServiceDiscovery/GettingStarted.razor     |  24 --
 .../Pages/ServiceDiscovery/Index.razor        |  81 +++---
 .../Pages/ServiceDiscovery/Redirects.razor    |  14 +
 src/Client/Components/Pages/Support.razor     | 103 ++++---
 src/Client/Components/Pages/Training.razor    |  97 ++++---
 .../Components/Pages/Web-Applications.razor   | 131 ++++-----
 .../Components/Pages/Why-Steeltoe.razor       | 129 ++++-----
 src/Client/Components/Routes.razor            |   8 -
 src/Client/Components/Template.razor          | 109 +++----
 src/Client/Components/Tip.razor               |  18 --
 src/Client/Components/Tutorial.razor          |  24 --
 src/Client/Models/CalendarEvent.cs            |  15 +-
 src/Client/Models/CalendarEventOptions.cs     |   9 +-
 src/Client/Models/DocsSiteOptions.cs          |  49 ++--
 src/Client/Models/Feature.cs                  |  15 +-
 src/Client/Program.cs                         |  13 +-
 src/Client/appsettings.Docker.json            |  11 -
 src/Client/appsettings.json                   |  27 +-
 src/Client/wwwroot/js/functions.js            |   3 -
 src/Steeltoe-MainSite.sln                     |   2 -
 94 files changed, 1265 insertions(+), 2404 deletions(-)
 delete mode 100644 src/Client/Components/Breadcrumbs.razor
 delete mode 100644 src/Client/Components/CustomPageTitle.razor
 delete mode 100644 src/Client/Components/GetStarted.razor
 delete mode 100644 src/Client/Components/Pages/AppConfiguration/Cloudfoundry.razor
 delete mode 100644 src/Client/Components/Pages/AppConfiguration/GettingStarted.razor
 delete mode 100644 src/Client/Components/Pages/AppConfiguration/Placeholder.razor
 delete mode 100644 src/Client/Components/Pages/AppConfiguration/Randomvalue.razor
 create mode 100644 src/Client/Components/Pages/AppConfiguration/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/AppConfiguration/Springconfig.razor
 delete mode 100644 src/Client/Components/Pages/CircuitBreakers/Breaker.razor
 create mode 100644 src/Client/Components/Pages/CircuitBreakers/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/DynamicLogging/Index.razor
 create mode 100644 src/Client/Components/Pages/DynamicLogging/Redirects.razor
 create mode 100644 src/Client/Components/Pages/GenericGuidesRedirect.razor
 delete mode 100644 src/Client/Components/Pages/GetStarted/Index.razor
 delete mode 100644 src/Client/Components/Pages/Management/Endpoints.razor
 delete mode 100644 src/Client/Components/Pages/Management/Endpoints_Framework.razor
 delete mode 100644 src/Client/Components/Pages/Management/GettingStarted.razor
 delete mode 100644 src/Client/Components/Pages/Management/Logging.razor
 create mode 100644 src/Client/Components/Pages/Management/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/Management/Tracing.razor
 delete mode 100644 src/Client/Components/Pages/Messaging/GettingStarted.razor
 delete mode 100644 src/Client/Components/Pages/Messaging/Rabbit.razor
 create mode 100644 src/Client/Components/Pages/Messaging/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/NetworkFileSharing/Index.razor
 create mode 100644 src/Client/Components/Pages/NetworkFileSharing/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/Observability/AppManager.razor
 delete mode 100644 src/Client/Components/Pages/Observability/Grafana.razor
 delete mode 100644 src/Client/Components/Pages/Observability/Index.razor
 create mode 100644 src/Client/Components/Pages/Observability/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/Observability/WaveFront.razor
 delete mode 100644 src/Client/Components/Pages/Security/Credhub.razor
 delete mode 100644 src/Client/Components/Pages/Security/GettingStarted.razor
 delete mode 100644 src/Client/Components/Pages/Security/Jwt.razor
 create mode 100644 src/Client/Components/Pages/Security/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/Security/Redisstore.razor
 delete mode 100644 src/Client/Components/Pages/Security/Sso_OAuth.razor
 delete mode 100644 src/Client/Components/Pages/Security/Sso_OpenID.razor
 delete mode 100644 src/Client/Components/Pages/Security/Sso_OpenID_Framework.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Gemfire.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/GettingStarted.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Mongo.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Mssql.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Mysql.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Oauth.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Postgresql.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Rabbit.razor
 create mode 100644 src/Client/Components/Pages/ServiceConnectors/Redirects.razor
 delete mode 100644 src/Client/Components/Pages/ServiceConnectors/Redis.razor
 delete mode 100644 src/Client/Components/Pages/ServiceDiscovery/Consul.razor
 delete mode 100644 src/Client/Components/Pages/ServiceDiscovery/Eureka.razor
 delete mode 100644 src/Client/Components/Pages/ServiceDiscovery/GettingStarted.razor
 create mode 100644 src/Client/Components/Pages/ServiceDiscovery/Redirects.razor
 delete mode 100644 src/Client/Components/Routes.razor
 delete mode 100644 src/Client/Components/Tip.razor
 delete mode 100644 src/Client/Components/Tutorial.razor
 delete mode 100644 src/Client/appsettings.Docker.json
 delete mode 100644 src/Client/wwwroot/js/functions.js

diff --git a/README.md b/README.md
index 2065705..978e2da 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,10 @@
 # Steeltoe Main Site
 
-	The site was built using [Blazor](https://docs.microsoft.com/en-us/aspnet/core/blazor/) in Visual Studio. 
+	The site was built using [Blazor](https://docs.microsoft.com/aspnet/core/blazor/) in Visual Studio. 
 
 ## Install Dependencies
-Requires .NET Core SDK 8.0
 
-```powershell
-PS> dotnet new -i Microsoft.AspNetCore.Blazor.Templates
-```
+Requires .NET 8.0+ SDK
 
 ## Local testing of Steeltoe site
 
@@ -16,7 +13,8 @@ PS> dotnet new -i Microsoft.AspNetCore.Blazor.Templates
 PS> cd src/Client
 ```
 
-2. Run the application with the `watch` command. So as changes are made in Visual Studio, the site will refresh.
+1. Run the application with the `watch` command. So as changes are made, the site will refresh.
+
 ```powershell
 PS> dotnet watch run
 
diff --git a/src/Client/Components/App.razor b/src/Client/Components/App.razor
index 9be5a11..bdd0c08 100644
--- a/src/Client/Components/App.razor
+++ b/src/Client/Components/App.razor
@@ -1,3 +1,4 @@
+@using Steeltoe.Client.Components.Layout
 @inject IHostEnvironment HostEnvironment
 
 <!DOCTYPE html>
@@ -5,27 +6,20 @@
 <head>
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
     <script src="https://cdn.cookielaw.org/scripttemplates/otSDKStub.js" data-domain-script="018ee7f5-70e6-7787-8d98-05c8f935c75d"></script>
-    <script>function OptanonWrapper() { }</script>
+    <script>function OptanonWrapper(){}</script>
     <script>
         function setGTM(w,d,s,l,i){ w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);}
         if(document.cookie.indexOf('OptanonConsent')>-1&&document.cookie.indexOf('groups=')>-1){setGTM(window,document,'script','dataLayer','GTM-MMDFJKF');}else{waitForOnetrustActiveGroups();}var timer;function waitForOnetrustActiveGroups(){if(document.cookie.indexOf('OptanonConsent')>-1&&document.cookie.indexOf('groups=')>-1){clearTimeout(timer);setGTM(window,document,'script','dataLayer','GTM-MMDFJKF');}else{timer=setTimeout(waitForOnetrustActiveGroups,250);}}
     </script>
-
     <meta content="IE=edge" http-equiv="X-UA-Compatible">
     <meta charset="utf-8">
     <meta content="width=device-width,initial-scale=1.0" name="viewport">
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-
     <meta property="og:type" content="website">
-    <meta property="og:title" content="Create cloud-native .NET microservices with Steeltoe." />
-    <meta property="og:url" content="https://www.steeltoe.io" />
-    <meta property="og:image" content="https://steeltoe.io/images/favicon.png" />
-    <meta property="og:description" content="Create .NET microservices for modern platforms with Steeltoe. It's a friend of Spring Cloud and can be used anywhere." />
-    <meta name="twitter:title" content="Create cloud-native .NET microservices with Steeltoe.">
-
+    <meta property="og:url" content="https://www.steeltoe.io"/>
+    <meta property="og:image" content="https://steeltoe.io/images/favicon.png"/>
     <meta content="Create cloud-native .NET microservices with Steeltoe." name="DC.Title" xml:lang="EN">
     <meta content="cloud-native, .net, dotnet, framework, cloud, developer" name="DC.Subject" xml:lang="EN">
-    <meta content="Create .NET microservices for modern platforms with Steeltoe. It's a friend of Spring Cloud and can be used anywhere." name="description" xml:lang="EN">
     <meta content="EN" name="DC.Language" scheme="dcterms:RFC1766">
     <meta content="https://steeltoe.io/" name="DC.Identifier" schema="DCterms:URI">
     <meta content="text/html" name="DC.Format" schema="DCterms:IMT">
@@ -35,36 +29,35 @@
     <meta content="Steeltoe OSS" name="DC.Contributor">
     <meta content="2019-10-03" name="DC.Date" scheme="ISO8601">
     <meta content="text/html" name="DC.Type">
-    <meta content="https://steeltoe.io/" name="DC.Identifier">
-    <meta content="Copyright © 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries." name="DC.Rights">
-
-    <base href="/" />
-    <title>Steeltoe OSS</title>
+    <meta content="Copyright © 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term &quot;Broadcom&quot; refers to Broadcom Inc. and/or its subsidiaries." name="DC.Rights">
+    <base href="/"/>
     <link rel="canonical" href="https://steeltoe.io/">
-    <link rel="icon" href="https://steeltoe.io/images/favicon.png" type="image/png" />
+    <link rel="icon" href="/images/favicon.png" type="image/png"/>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
-    <link rel="stylesheet" href="css/fonts.css" />
-    <link rel="stylesheet" href="css/site.css" />
-    <link rel="stylesheet" href="css/mobile.css" />
-    <HeadOutlet />
+    <link rel="stylesheet" href="css/fonts.css"/>
+    <link rel="stylesheet" href="css/site.css"/>
+    <link rel="stylesheet" href="css/mobile.css"/>
+    <HeadOutlet/>
 </head>
 <body>
-    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-MMDFJKF" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-    <div id="blazor-error-ui">
-        @if (HostEnvironment.IsProduction())
-        {
-            <span>An error has occurred.</span>
-        }
-        else
-        {
-            <span>An unhandled exception occurred. See browser dev tools for details.</span>
-        }
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
-    <Routes />
-    <script src="js/functions.js" type="text/javascript"></script>
-    <script src="_framework/blazor.web.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-MMDFJKF" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<div id="blazor-error-ui">
+    @if (HostEnvironment.IsProduction())
+    {
+        <span>An error has occurred.</span>
+    }
+    else
+    {
+        <span>An unhandled exception occurred. See browser dev tools for details.</span>
+    }
+    <a href="" class="reload">Reload</a>
+    <a class="dismiss">🗙</a>
+</div>
+<Router AppAssembly="@typeof(App).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
+    </Found>
+</Router>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
 </body>
 </html>
diff --git a/src/Client/Components/Banner.razor b/src/Client/Components/Banner.razor
index 83956ad..be76bdb 100644
--- a/src/Client/Components/Banner.razor
+++ b/src/Client/Components/Banner.razor
@@ -1,10 +1,10 @@
-<div class="rounded-pill banner">
+<div class="banner">
 	<Href href="@Href" NewWindow="@NewWindow">
 		<div class="row no-gutters align-items-center">
 			<div class="col-2" style="margin: .7% 3% .7% 5%;max-width: 11%;">
 				<div class="sign rounded-pill special-link">
-				<div style="padding: 2px 0px 2px 0px;">@BannerTypeName</div>
-				</div>
+				<div style="padding: 2px;">@BannerTypeName</div>
+			</div>
 			</div>
 			<div class="col desc">
 				@ChildContent
@@ -13,16 +13,10 @@
 	</Href>
 </div>
 
-@code {
-	[Parameter]
-	public RenderFragment ChildContent { get; set; }
-
-	[Parameter]
-	public string Href {get;set;}
-
-	[Parameter]
-	public string BannerTypeName { get; set; } = "event";
-	
-	[Parameter]
-	public bool NewWindow { get; set; } = true;
+@code
+{
+	[Parameter] public RenderFragment ChildContent { get; set; }
+	[Parameter] public string Href {get;set;}
+	[Parameter] public string BannerTypeName { get; set; } = "event";
+	[Parameter] public bool NewWindow { get; set; } = true;
 }
diff --git a/src/Client/Components/Breadcrumbs.razor b/src/Client/Components/Breadcrumbs.razor
deleted file mode 100644
index 9113b4b..0000000
--- a/src/Client/Components/Breadcrumbs.razor
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<div class="width-all">
-	<div class="width-90 container">
-		<div class="row no-gutters breadcrumbs">
-			<div class="col">
-				<ul>
-					<li><Href href="/index"><span class="oi oi-home"></span></Href></li>
-					<li class="delimiter">&gt;</li>
-					@if (!string.IsNullOrEmpty(ParentLinkName)){
-						<li class=""><a href="@ParentLinkUrl">@ParentLinkName</a></li>
-						<li class="delimiter">&gt;</li>
-					}
-					@if (ShowGetStarted)
-					{
-						<li class=""><a href="@ParentLinkUrl/get-started">Get Started</a></li>
-						<li class="delimiter">&gt;</li>
-					}
-					<li class="">@NavName</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
-
-@code {
-	[Parameter]
-	public string NavName { get; set; }
-	[Parameter]
-	public bool ShowGetStarted { get; set; } = false;
-	[Parameter]
-	public bool ShowDocs { get; set; } = false;
-	[Parameter]
-	public string ParentLinkUrl { get; set; }
-	[Parameter]
-	public string ParentLinkName { get; set; }
-
-}
diff --git a/src/Client/Components/CustomPageTitle.razor b/src/Client/Components/CustomPageTitle.razor
deleted file mode 100644
index fe6f55b..0000000
--- a/src/Client/Components/CustomPageTitle.razor
+++ /dev/null
@@ -1,13 +0,0 @@
-@inject IJSRuntime JsRuntime
-
-@code {
-	[Parameter]
-	public string Title {get;set;}
-
-	protected override Task OnAfterRenderAsync(bool firstRender) {
-		string title = !string.IsNullOrEmpty(Title) ? "Steeltoe - " + Title : "Steeltoe";
-		JsRuntime.InvokeVoidAsync("setPageTitle", title);
-
-		return base.OnAfterRenderAsync(firstRender);
-	}
-}
diff --git a/src/Client/Components/GetStarted.razor b/src/Client/Components/GetStarted.razor
deleted file mode 100644
index 15b2ece..0000000
--- a/src/Client/Components/GetStarted.razor
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="width-all">
- <div class="width-90 container">
-  <div class="row no-gutters">
-   <div class="col get-started-title">Get Started with @ComponentName</div>
-  </div>
-  <div class="row no-gutters get-started-tutorials">
-   @Tutorials
-  </div>
- </div>
-</div>
-
-@code {
-	[Parameter]
-	public RenderFragment ComponentName { get; set; }
-	[Parameter]
-	public RenderFragment Tutorials { get; set; }
-}
diff --git a/src/Client/Components/Href.razor b/src/Client/Components/Href.razor
index 4c7491c..c80a7d9 100644
--- a/src/Client/Components/Href.razor
+++ b/src/Client/Components/Href.razor
@@ -1,14 +1,14 @@
-<NavLink class="@(Class + " nav-link" + (AsButton?"border border-dark font-weight-bold btn btn-default border-black p-3":""))" target="@(NewWindow?"_blank":"")" role="@(AsButton?"button":"")" @attributes="AdditionalAttributes">@ChildContent</NavLink>
 
-@code {
-	[Parameter]
-	public RenderFragment ChildContent { get; set; }
-	[Parameter]
-	public string Class { get; set; }
-	[Parameter]
-	public bool AsButton { get; set; } = false;
-	[Parameter]
-	public bool NewWindow { get; set; } = false;
-	[Parameter(CaptureUnmatchedValues = true)]
-	public Dictionary<string, object> AdditionalAttributes { get; set; }
+<NavLink class="@(Class + " nav-link" + (AsButton ? " border border-dark font-weight-bold btn btn-default border-black p-3" : ""))"
+         target="@(NewWindow ? "_blank" : "")" role="@(AsButton ? "button" : "")" @attributes="AdditionalAttributes">@ChildContent</NavLink>
+
+@code
+{
+	[Parameter] public RenderFragment ChildContent { get; set; }
+	[Parameter] public string Class { get; set; }
+	[Parameter] public bool AsButton { get; set; } = false;
+	[Parameter] public bool NewWindow { get; set; } = false;
+
+    [Parameter(CaptureUnmatchedValues = true)]
+    public Dictionary<string, object> AdditionalAttributes { get; set; }
 }
diff --git a/src/Client/Components/Layout/MainLayout.razor b/src/Client/Components/Layout/MainLayout.razor
index 355ed63..613228f 100644
--- a/src/Client/Components/Layout/MainLayout.razor
+++ b/src/Client/Components/Layout/MainLayout.razor
@@ -1,38 +1,7 @@
 @inherits LayoutComponentBase
-@inject NavigationManager NavigationManager
 
-<header class="sticky-top bg-white" style="box-shadow: 0 0 20px -4px #eeeeee;">
-	<SiteHeader />
-</header>
+<SiteHeader />
 <div id="main">
 	@Body
 </div>
-<footer class="@footerClass">
-	<SiteFooter />
-</footer>
-
-@code {
-	private string footerClass { get; set; } = "";
-
-	protected override async Task OnInitializedAsync() {
-		NavigationManager.LocationChanged += LocationChanged;
-
-		if (NavigationManager.Uri.Contains("docs") || NavigationManager.Uri.Contains("labs"))
-			footerClass = "hide";
-		else
-			footerClass = "";
-
-		await base.OnInitializedAsync();
-	}
-	private void LocationChanged(object sender, LocationChangedEventArgs e) {
-		if (e.Location.Contains("docs") || NavigationManager.Uri.Contains("labs"))
-			footerClass = "hide";
-		else
-			footerClass = "";
-
-		StateHasChanged();
-	}
-	private void Dispose() {
-		NavigationManager.LocationChanged -= LocationChanged;
-	}
-}
+<SiteFooter />
diff --git a/src/Client/Components/Layout/SiteFooter.razor b/src/Client/Components/Layout/SiteFooter.razor
index d3fbac8..9e06d76 100644
--- a/src/Client/Components/Layout/SiteFooter.razor
+++ b/src/Client/Components/Layout/SiteFooter.razor
@@ -1,173 +1,108 @@
-@using Microsoft.Extensions.Options
-
 @inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
 
-<div class="width-all bg-midnight-blue">
-    <div class="width-90 container" id="footer">
-        <div class="row bottom-bar">
-            <div class="col-sm-4 pl-5 text-center">
-                <Href href="/index">
-                    <?xml version="1.0" encoding="utf-8" ?>
-                    <!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-                    <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="75px" preserveAspectRatio="xMidYMid meet" viewBox="0 0 617.6 180.5" xml:space="preserve">
-<style type="text/css">
-    .logo-white {
-        fill: #FFFFFF;
-    }
-</style>
-<title>PVLG-Steeltoe-white-2019</title>
-<polygon class="logo-white" points="70.7,176.2 35.4,115 0,135.4 " />
-<polygon class="logo-white" points="78.2,96.2 5.2,54.1 39,112.8 78.2,180.5 156.3,135.4 119.8,72.2 " />
-<polygon class="logo-white" points="78.2,0 0,45.1 78.2,90.2 78.2,90.2 156.3,45.1 " />
-<path class="logo-white" d="M231.6,77c2.9,1.2,5.9,2.2,8.9,2.8c3.3,0.8,6.6,1.8,9.8,3c2.5,1,4.7,2.6,6.5,4.7c1.9,2.4,2.9,5.4,2.7,8.5
-	c0.1,4.2-1.8,8.2-5.1,10.9c-3.5,2.9-8.3,4.4-14.6,4.4c-6.5,0.1-12.9-1.5-18.6-4.6c-1.1-0.8-1.8-2.1-1.7-3.4c0-1.1,0.4-2.1,1.1-2.9
-	c0.7-0.8,1.8-1.3,2.9-1.2c0.6,0,1.3,0.1,1.9,0.4c2.1,0.9,4.3,1.7,6.5,2.2c2.4,0.6,4.9,0.9,7.4,0.8c7.6,0,11.4-2.4,11.4-7.3
-	c0-1.6-1.1-3.1-2.6-3.6c-2.8-1.2-5.6-2.1-8.6-2.8c-3.4-0.8-6.7-1.8-10-3c-2.6-1-4.9-2.6-6.8-4.7c-1.9-2.3-2.9-5.2-2.8-8.2
-	c-0.1-4.5,1.8-8.8,5.1-11.7c3.5-3,8.4-4.5,14.8-4.5c5.1,0,10.1,0.8,14.8,2.6c0.9,0.2,1.7,0.8,2.2,1.5c1.2,1.6,1,3.8-0.4,5.2
-	c-0.8,0.8-1.8,1.2-2.9,1.2c-0.4,0-0.9-0.1-1.3-0.2c-3.8-1.2-7.7-1.8-11.7-1.9c-3.7,0-6.6,0.6-8.6,2c-1.9,1-3.1,3-3.1,5.1
-	C228.7,74.3,229.8,76.1,231.6,77z" />
-<path class="logo-white" d="M299.3,103c0.7,0.7,1.1,1.6,1.1,2.6c0,1.6-0.9,3-2.3,3.6c-2.7,1.2-5.6,1.9-8.5,1.9c-10,0-14.9-4.5-14.9-13.5
-	V65.8h-7.3c-1.1,0-1.9-0.8-1.9-1.9c0,0,0,0,0-0.1c0-0.7,0.3-1.3,0.9-1.7l13.9-13.6c0.4-0.5,1.1-0.8,1.7-0.9c0.5,0,1,0.2,1.4,0.6
-	c0.4,0.4,0.6,0.9,0.6,1.4v8.2h11.5c2.1-0.1,3.9,1.5,4,3.7c0,0.1,0,0.2,0,0.3c0,1-0.4,2.1-1.1,2.8c-0.7,0.8-1.8,1.2-2.9,1.2H284v30.9
-	c0,2.6,0.6,4.4,1.9,5.1c1.5,0.8,3.1,1.1,4.8,1.1c1.4,0,2.8-0.2,4.1-0.6c0.3-0.1,0.6-0.1,0.9-0.2c0.4-0.1,0.8-0.1,1.2-0.1
-	C297.8,101.9,298.7,102.3,299.3,103z" />
-<path class="logo-white" d="M353.4,99.8c0.8,0.7,1.3,1.8,1.2,2.9c0,1.5-0.9,2.8-2.7,3.8c-2.5,1.4-5.1,2.6-7.9,3.4c-3.3,0.8-6.6,1.2-10,1.1
-	c-8.3,0-14.8-2.4-19.5-7.1s-7-11.4-7-20c-0.1-4.6,0.9-9.2,2.7-13.4c1.7-4,4.6-7.5,8.2-9.9c8.2-5,18.5-5.1,26.7-0.3
-	c3.6,2.3,6.5,5.6,8.4,9.4c1.9,4,2.9,8.4,2.9,12.9c0,1.2-0.4,2.4-1.3,3.3c-0.9,0.9-2.1,1.4-3.4,1.3H317c0.6,4.8,2.3,8.5,5.3,11.2
-	c3,2.7,7.2,4,12.6,4c2.5,0,5.1-0.2,7.5-0.8c2.2-0.6,4.3-1.4,6.3-2.3c0.6-0.3,1.2-0.4,1.9-0.4C351.6,98.8,352.6,99.1,353.4,99.8z
-	 M325.1,66.2c-2.3,1.1-4.3,2.8-5.6,5c-1.6,2.5-2.5,5.4-2.5,8.4h30.2c-0.1-3-1-5.9-2.6-8.4c-1.4-2.1-3.4-3.9-5.7-5
-	c-2.1-1-4.5-1.6-6.8-1.6C329.7,64.7,327.3,65.2,325.1,66.2z" />
-<path class="logo-white" d="M411.7,99.8c0.8,0.7,1.3,1.8,1.2,2.9c0,1.5-0.9,2.8-2.7,3.8c-2.5,1.4-5.1,2.6-7.9,3.4c-3.3,0.8-6.6,1.2-10,1.1
-	c-8.3,0-14.8-2.4-19.5-7.1s-7-11.4-7-20c-0.1-4.6,0.9-9.2,2.7-13.4c1.7-4,4.6-7.5,8.2-9.9c8.2-5,18.5-5.1,26.7-0.3
-	c3.6,2.3,6.5,5.6,8.4,9.4c1.9,4,2.9,8.4,2.9,12.9c0,1.2-0.4,2.4-1.3,3.3c-0.9,0.9-2.1,1.4-3.4,1.3h-34.7c0.6,4.8,2.3,8.5,5.3,11.2
-	c3,2.7,7.2,4,12.6,4c2.5,0,5.1-0.2,7.5-0.8c2.2-0.6,4.3-1.4,6.3-2.3c0.6-0.3,1.2-0.4,1.9-0.4C409.9,98.7,411,99.1,411.7,99.8z
-	 M383.5,66.2c-2.3,1.1-4.2,2.8-5.6,5c-1.6,2.5-2.5,5.4-2.6,8.4h30.2c-0.1-3-1-5.9-2.6-8.4c-1.4-2.1-3.4-3.9-5.7-5
-	c-2.1-1-4.5-1.6-6.8-1.6C388,64.7,385.6,65.2,383.5,66.2z" />
-<path class="logo-white" d="M436.1,36.1c0.9,0.9,1.4,2.1,1.3,3.4v66.4c0,1.2-0.5,2.4-1.4,3.3c-0.9,0.9-2.1,1.4-3.3,1.4
-	c-1.2,0-2.4-0.5-3.3-1.4c-0.9-0.9-1.4-2.1-1.3-3.3V39.5c0-1.2,0.5-2.5,1.3-3.3c0.9-0.9,2-1.4,3.3-1.4
-	C434,34.7,435.2,35.2,436.1,36.1z" />
-<path class="logo-white" d="M482.4,103c0.7,0.7,1.1,1.6,1.1,2.6c0,1.6-0.9,3-2.3,3.6c-2.7,1.2-5.6,1.9-8.5,1.9c-10,0-14.9-4.5-14.9-13.5
-	V65.8h-7.3c-1.1,0-1.9-0.8-1.9-1.9c0,0,0,0,0-0.1c0-0.7,0.3-1.3,0.9-1.7l13.9-13.6c0.4-0.5,1.1-0.8,1.7-0.9c0.5,0,1,0.2,1.4,0.6
-	c0.4,0.4,0.6,0.9,0.6,1.4v8.2h11.6c2.1-0.1,3.9,1.5,4,3.7c0,0.1,0,0.2,0,0.3c0,1-0.4,2.1-1.1,2.8c-0.7,0.8-1.8,1.2-2.9,1.2h-11.6
-	v30.9c0,2.6,0.7,4.4,1.9,5.1c1.5,0.8,3.1,1.1,4.8,1.1c1.4,0,2.8-0.2,4.1-0.6c0.3-0.1,0.6-0.1,0.9-0.2c0.4-0.1,0.8-0.1,1.2-0.1
-	C480.9,101.9,481.8,102.3,482.4,103z" />
-<path class="logo-white" d="M530.5,60.2c3.9,2.2,7.1,5.6,9.2,9.6c4.4,9,4.4,19.4,0,28.4c-2.1,4-5.3,7.3-9.2,9.6c-8.6,4.5-18.9,4.5-27.5,0
-	c-3.9-2.2-7.1-5.6-9.2-9.6c-4.3-9-4.3-19.4,0-28.4c2.1-4,5.3-7.3,9.2-9.6C511.6,55.6,521.9,55.6,530.5,60.2L530.5,60.2z
-	 M524.8,100.6c2.7-1.4,4.9-3.5,6.4-6.1c1.8-3.3,2.7-6.9,2.5-10.6c0.1-3.7-0.7-7.3-2.5-10.6c-1.5-2.6-3.7-4.7-6.4-6.1
-	c-2.5-1.2-5.2-1.9-8-1.9c-2.8,0-5.6,0.6-8.1,1.9c-2.7,1.3-4.8,3.5-6.3,6.1c-1.8,3.2-2.6,6.9-2.5,10.6c-0.2,3.7,0.7,7.4,2.4,10.6
-	c1.4,2.6,3.6,4.8,6.3,6.1c2.5,1.3,5.3,2,8.1,2C519.5,102.6,522.3,101.9,524.8,100.6L524.8,100.6z" />
-<path class="logo-white" d="M598.7,99.8c0.8,0.7,1.3,1.8,1.2,2.9c0,1.5-0.9,2.8-2.7,3.8c-2.5,1.4-5.1,2.6-7.9,3.4c-3.3,0.8-6.6,1.2-10,1.1
-	c-8.3,0-14.8-2.4-19.5-7.1s-7-11.4-7-20c-0.1-4.6,0.9-9.2,2.7-13.4c1.7-4,4.6-7.5,8.2-9.9c8.2-5,18.5-5.1,26.7-0.3
-	c3.6,2.3,6.5,5.6,8.4,9.4c1.9,4,2.9,8.4,2.8,12.9c0,1.2-0.4,2.4-1.3,3.3c-0.9,0.9-2.1,1.4-3.4,1.3h-34.7c0.6,4.8,2.3,8.5,5.3,11.2
-	c3,2.7,7.2,4,12.6,4c2.5,0,5.1-0.2,7.5-0.8c2.2-0.6,4.3-1.4,6.3-2.3c0.6-0.3,1.2-0.4,1.9-0.4C596.9,98.7,598,99.1,598.7,99.8z
-	 M570.5,66.2c-2.3,1.1-4.2,2.8-5.6,5c-1.6,2.5-2.5,5.4-2.5,8.4h30.2c-0.1-3-1-5.9-2.6-8.4c-1.4-2.1-3.4-3.9-5.7-5
-	c-2.1-1-4.5-1.6-6.8-1.6C575,64.7,572.6,65.2,570.5,66.2z" />
-<path class="logo-white" d="M611.3,69.5c-3.5,0-6.3-2.8-6.3-6.3c0-3.5,2.8-6.3,6.3-6.3c3.5,0,6.3,2.8,6.3,6.3c0,0,0,0,0,0
-	C617.6,66.6,614.7,69.5,611.3,69.5z M611.3,57.8c-3,0-5.4,2.4-5.4,5.3c0,3,2.4,5.4,5.4,5.4c3,0,5.3-2.4,5.3-5.3c0,0,0,0,0,0
-	C616.6,60.2,614.3,57.8,611.3,57.8C611.3,57.8,611.3,57.8,611.3,57.8z M613,66.8l-1.9-2.9h-1.2v2.9h-1v-7.2h2.9
-	c1.2-0.1,2.3,0.9,2.3,2.1c0,0,0,0,0,0.1c0,1.1-0.8,2-1.8,2.1l2,2.9L613,66.8z M611.8,60.5h-1.9v2.6h1.9c0.7,0,1.3-0.6,1.3-1.3
-	S612.5,60.5,611.8,60.5C611.8,60.5,611.8,60.5,611.8,60.5z" />
-
-</svg>
-                </Href>
-                <Href href="https://dotnetfoundation.org/" NewWindow="true">
-                    <img src="/images/dotnet_foundation_logo-white.webp" alt=".NET Foundation" style="margin-top:30px;max-width:199px;width:80%" />
-                </Href>
-            </div>
-            <div class="col" id="footer-why-col">
-                <div class="pb-2 font-weight-bold">Why Steeltoe</div>
-                <div><Href href="/why-steeltoe">Overview</Href></div>
-                <div><Href href="/microservices">Microservices</Href></div>
-                <div><Href href="/cloud">Cloud</Href></div>
-                <div><Href href="/web-applications">Web Applications</Href></div>
-                <div><Href href="/event-driven">Event Driven</Href></div>
-            </div>
-            <div class="col" id="footer-learn-col">
-                <div class="pb-2 font-weight-bold">Learn</div>
-                <div><Href href="https://start.steeltoe.io/" NewWindow="true">Steeltoe Initializr</Href></div>
-                <div><Href href="@(_docsSite.GuidesHome)">Guides</Href></div>
-                <div><Href href="@(_docsSite.DocsHome)">Documentation</Href></div>
-                <div><Href href="@(_docsSite.ApiBrowserHome)">API Browser</Href></div>
-                <div><Href href="@(_docsSite.BlogHome)">Blog</Href></div>
-            </div>
-            <div class="col" id="footer-projects-col">
-                <div class="pb-2 font-weight-bold">Projects</div>
-                <div><Href href="/app-configuration">Application Configuration</Href></div>
-                <div><Href href="/circuit-breakers">Circuit Breakers</Href></div>
-                <div><Href href="/logging">Dynamic Logging</Href></div>
-                <div><Href href="/cloud-management">Management</Href></div>
-                <div><Href href="/messaging">Messaging</Href></div>
-                <div><Href href="@(_docsSite.FileShareHome)">Network File Sharing</Href></div>
-                <div><Href href="/security-providers">Security</Href></div>
-                <div><Href href="/service-connectors">Service Connectors</Href></div>
-                <div><Href href="/service-discovery">Service Discovery</Href></div>
-                <div><Href href="@(_docsSite.DocsStreamHome)">Stream</Href></div>
-            </div>
-            <div class="col" id="footer-others-col">
-                @*<div class="pb-2 font-weight-bold"><Href href="/training">Training</Href></div>*@
-                <div class="pb-2 font-weight-bold"><Href href="/support">Support</Href></div>
-                <div class="pb-2 font-weight-bold"><Href href="/community">Community</Href></div>
-            </div>
-        </div>
-        <div class="row py-sm-0 py-4">
-            <div class="col text-right">
-                <Href href="https://github.com/SteeltoeOSS" title="Steeltoe on GitHub" NewWindow="true">
-                    <svg id="github-icon" width="100px" height="50px" viewBox="0 0 1 75" xmlns="http://www.w3.org/2000/svg">
-                        <defs>
-                            <style>
-                                #github-icon .cls-1 {
-                                    fill: #ffffff;
-                                }
-
-                                #github-icon .cls-2 {
-                                    fill: #000000;
-                                    fill-rule: evenodd;
-                                }
-                            </style>
-                        </defs>
-                        <path class="cls-1" d="M38,0a38,38,0,1,0,38,38A38,38,0,0,0,38,0Z"></path>
-                        <path class="cls-2" d="M38,15.59A22.95,22.95,0,0,0,30.71,60.3c1.15.21,1.57-.5,1.57-1.11s0-2,0-3.9c-6.38,1.39-7.73-3.07-7.73-3.07A6.09,6.09,0,0,0,22,48.86c-2.09-1.42.15-1.39.15-1.39a4.81,4.81,0,0,1,3.52,2.36c2,3.5,5.37,2.49,6.67,1.91a4.87,4.87,0,0,1,1.46-3.07c-5.09-.58-10.45-2.55-10.45-11.34a8.84,8.84,0,0,1,2.36-6.15,8.29,8.29,0,0,1,.23-6.07s1.92-.62,6.3,2.35a21.82,21.82,0,0,1,11.49,0c4.38-3,6.3-2.35,6.3-2.35a8.29,8.29,0,0,1,.23,6.07,8.84,8.84,0,0,1,2.36,6.15c0,8.81-5.37,10.75-10.48,11.32a5.46,5.46,0,0,1,1.56,4.25c0,3.07,0,5.54,0,6.29s.42,1.33,1.58,1.1A22.94,22.94,0,0,0,38,15.59Z"></path>
-                    </svg>
-                </Href>
+<footer>
+    <div class="width-all bg-midnight-blue">
+        <div class="width-90 container" id="footer">
+            <div class="row bottom-bar">
+                <div class="col-sm-4 pl-5 text-center">
+                    <Href href="/index">
+                        <?xml version="1.0" encoding="utf-8" ?>
+                        <!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+                        <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="75px" preserveAspectRatio="xMidYMid meet" viewBox="0 0 617.6 180.5" xml:space="preserve">
+                            <style type="text/css">.logo-white { fill: #FFFFFF; }</style>
+                            <title>PVLG-Steeltoe-white-2019</title>
+                            <polygon class="logo-white" points="70.7,176.2 35.4,115 0,135.4 " />
+                            <polygon class="logo-white" points="78.2,96.2 5.2,54.1 39,112.8 78.2,180.5 156.3,135.4 119.8,72.2 " />
+                            <polygon class="logo-white" points="78.2,0 0,45.1 78.2,90.2 78.2,90.2 156.3,45.1 " />
+                            <path class="logo-white" d="M231.6,77c2.9,1.2,5.9,2.2,8.9,2.8c3.3,0.8,6.6,1.8,9.8,3c2.5,1,4.7,2.6,6.5,4.7c1.9,2.4,2.9,5.4,2.7,8.5c0.1,4.2-1.8,8.2-5.1,10.9c-3.5,2.9-8.3,4.4-14.6,4.4c-6.5,0.1-12.9-1.5-18.6-4.6c-1.1-0.8-1.8-2.1-1.7-3.4c0-1.1,0.4-2.1,1.1-2.9c0.7-0.8,1.8-1.3,2.9-1.2c0.6,0,1.3,0.1,1.9,0.4c2.1,0.9,4.3,1.7,6.5,2.2c2.4,0.6,4.9,0.9,7.4,0.8c7.6,0,11.4-2.4,11.4-7.3c0-1.6-1.1-3.1-2.6-3.6c-2.8-1.2-5.6-2.1-8.6-2.8c-3.4-0.8-6.7-1.8-10-3c-2.6-1-4.9-2.6-6.8-4.7c-1.9-2.3-2.9-5.2-2.8-8.2c-0.1-4.5,1.8-8.8,5.1-11.7c3.5-3,8.4-4.5,14.8-4.5c5.1,0,10.1,0.8,14.8,2.6c0.9,0.2,1.7,0.8,2.2,1.5c1.2,1.6,1,3.8-0.4,5.2c-0.8,0.8-1.8,1.2-2.9,1.2c-0.4,0-0.9-0.1-1.3-0.2c-3.8-1.2-7.7-1.8-11.7-1.9c-3.7,0-6.6,0.6-8.6,2c-1.9,1-3.1,3-3.1,5.1C228.7,74.3,229.8,76.1,231.6,77z" />
+                            <path class="logo-white" d="M299.3,103c0.7,0.7,1.1,1.6,1.1,2.6c0,1.6-0.9,3-2.3,3.6c-2.7,1.2-5.6,1.9-8.5,1.9c-10,0-14.9-4.5-14.9-13.5V65.8h-7.3c-1.1,0-1.9-0.8-1.9-1.9c0,0,0,0,0-0.1c0-0.7,0.3-1.3,0.9-1.7l13.9-13.6c0.4-0.5,1.1-0.8,1.7-0.9c0.5,0,1,0.2,1.4,0.6c0.4,0.4,0.6,0.9,0.6,1.4v8.2h11.5c2.1-0.1,3.9,1.5,4,3.7c0,0.1,0,0.2,0,0.3c0,1-0.4,2.1-1.1,2.8c-0.7,0.8-1.8,1.2-2.9,1.2H284v30.9c0,2.6,0.6,4.4,1.9,5.1c1.5,0.8,3.1,1.1,4.8,1.1c1.4,0,2.8-0.2,4.1-0.6c0.3-0.1,0.6-0.1,0.9-0.2c0.4-0.1,0.8-0.1,1.2-0.1C297.8,101.9,298.7,102.3,299.3,103z" />
+                            <path class="logo-white" d="M353.4,99.8c0.8,0.7,1.3,1.8,1.2,2.9c0,1.5-0.9,2.8-2.7,3.8c-2.5,1.4-5.1,2.6-7.9,3.4c-3.3,0.8-6.6,1.2-10,1.1c-8.3,0-14.8-2.4-19.5-7.1s-7-11.4-7-20c-0.1-4.6,0.9-9.2,2.7-13.4c1.7-4,4.6-7.5,8.2-9.9c8.2-5,18.5-5.1,26.7-0.3c3.6,2.3,6.5,5.6,8.4,9.4c1.9,4,2.9,8.4,2.9,12.9c0,1.2-0.4,2.4-1.3,3.3c-0.9,0.9-2.1,1.4-3.4,1.3H317c0.6,4.8,2.3,8.5,5.3,11.2c3,2.7,7.2,4,12.6,4c2.5,0,5.1-0.2,7.5-0.8c2.2-0.6,4.3-1.4,6.3-2.3c0.6-0.3,1.2-0.4,1.9-0.4C351.6,98.8,352.6,99.1,353.4,99.8zM325.1,66.2c-2.3,1.1-4.3,2.8-5.6,5c-1.6,2.5-2.5,5.4-2.5,8.4h30.2c-0.1-3-1-5.9-2.6-8.4c-1.4-2.1-3.4-3.9-5.7-5c-2.1-1-4.5-1.6-6.8-1.6C329.7,64.7,327.3,65.2,325.1,66.2z" />
+                            <path class="logo-white" d="M411.7,99.8c0.8,0.7,1.3,1.8,1.2,2.9c0,1.5-0.9,2.8-2.7,3.8c-2.5,1.4-5.1,2.6-7.9,3.4c-3.3,0.8-6.6,1.2-10,1.1c-8.3,0-14.8-2.4-19.5-7.1s-7-11.4-7-20c-0.1-4.6,0.9-9.2,2.7-13.4c1.7-4,4.6-7.5,8.2-9.9c8.2-5,18.5-5.1,26.7-0.3c3.6,2.3,6.5,5.6,8.4,9.4c1.9,4,2.9,8.4,2.9,12.9c0,1.2-0.4,2.4-1.3,3.3c-0.9,0.9-2.1,1.4-3.4,1.3h-34.7c0.6,4.8,2.3,8.5,5.3,11.2c3,2.7,7.2,4,12.6,4c2.5,0,5.1-0.2,7.5-0.8c2.2-0.6,4.3-1.4,6.3-2.3c0.6-0.3,1.2-0.4,1.9-0.4C409.9,98.7,411,99.1,411.7,99.8zM383.5,66.2c-2.3,1.1-4.2,2.8-5.6,5c-1.6,2.5-2.5,5.4-2.6,8.4h30.2c-0.1-3-1-5.9-2.6-8.4c-1.4-2.1-3.4-3.9-5.7-5c-2.1-1-4.5-1.6-6.8-1.6C388,64.7,385.6,65.2,383.5,66.2z" />
+                            <path class="logo-white" d="M436.1,36.1c0.9,0.9,1.4,2.1,1.3,3.4v66.4c0,1.2-0.5,2.4-1.4,3.3c-0.9,0.9-2.1,1.4-3.3,1.4c-1.2,0-2.4-0.5-3.3-1.4c-0.9-0.9-1.4-2.1-1.3-3.3V39.5c0-1.2,0.5-2.5,1.3-3.3c0.9-0.9,2-1.4,3.3-1.4C434,34.7,435.2,35.2,436.1,36.1z" />
+                            <path class="logo-white" d="M482.4,103c0.7,0.7,1.1,1.6,1.1,2.6c0,1.6-0.9,3-2.3,3.6c-2.7,1.2-5.6,1.9-8.5,1.9c-10,0-14.9-4.5-14.9-13.5V65.8h-7.3c-1.1,0-1.9-0.8-1.9-1.9c0,0,0,0,0-0.1c0-0.7,0.3-1.3,0.9-1.7l13.9-13.6c0.4-0.5,1.1-0.8,1.7-0.9c0.5,0,1,0.2,1.4,0.6c0.4,0.4,0.6,0.9,0.6,1.4v8.2h11.6c2.1-0.1,3.9,1.5,4,3.7c0,0.1,0,0.2,0,0.3c0,1-0.4,2.1-1.1,2.8c-0.7,0.8-1.8,1.2-2.9,1.2h-11.6v30.9c0,2.6,0.7,4.4,1.9,5.1c1.5,0.8,3.1,1.1,4.8,1.1c1.4,0,2.8-0.2,4.1-0.6c0.3-0.1,0.6-0.1,0.9-0.2c0.4-0.1,0.8-0.1,1.2-0.1C480.9,101.9,481.8,102.3,482.4,103z" />
+                            <path class="logo-white" d="M530.5,60.2c3.9,2.2,7.1,5.6,9.2,9.6c4.4,9,4.4,19.4,0,28.4c-2.1,4-5.3,7.3-9.2,9.6c-8.6,4.5-18.9,4.5-27.5,0c-3.9-2.2-7.1-5.6-9.2-9.6c-4.3-9-4.3-19.4,0-28.4c2.1-4,5.3-7.3,9.2-9.6C511.6,55.6,521.9,55.6,530.5,60.2L530.5,60.2zM524.8,100.6c2.7-1.4,4.9-3.5,6.4-6.1c1.8-3.3,2.7-6.9,2.5-10.6c0.1-3.7-0.7-7.3-2.5-10.6c-1.5-2.6-3.7-4.7-6.4-6.1c-2.5-1.2-5.2-1.9-8-1.9c-2.8,0-5.6,0.6-8.1,1.9c-2.7,1.3-4.8,3.5-6.3,6.1c-1.8,3.2-2.6,6.9-2.5,10.6c-0.2,3.7,0.7,7.4,2.4,10.6c1.4,2.6,3.6,4.8,6.3,6.1c2.5,1.3,5.3,2,8.1,2C519.5,102.6,522.3,101.9,524.8,100.6L524.8,100.6z" />
+                            <path class="logo-white" d="M598.7,99.8c0.8,0.7,1.3,1.8,1.2,2.9c0,1.5-0.9,2.8-2.7,3.8c-2.5,1.4-5.1,2.6-7.9,3.4c-3.3,0.8-6.6,1.2-10,1.1c-8.3,0-14.8-2.4-19.5-7.1s-7-11.4-7-20c-0.1-4.6,0.9-9.2,2.7-13.4c1.7-4,4.6-7.5,8.2-9.9c8.2-5,18.5-5.1,26.7-0.3c3.6,2.3,6.5,5.6,8.4,9.4c1.9,4,2.9,8.4,2.8,12.9c0,1.2-0.4,2.4-1.3,3.3c-0.9,0.9-2.1,1.4-3.4,1.3h-34.7c0.6,4.8,2.3,8.5,5.3,11.2c3,2.7,7.2,4,12.6,4c2.5,0,5.1-0.2,7.5-0.8c2.2-0.6,4.3-1.4,6.3-2.3c0.6-0.3,1.2-0.4,1.9-0.4C596.9,98.7,598,99.1,598.7,99.8zM570.5,66.2c-2.3,1.1-4.2,2.8-5.6,5c-1.6,2.5-2.5,5.4-2.5,8.4h30.2c-0.1-3-1-5.9-2.6-8.4c-1.4-2.1-3.4-3.9-5.7-5c-2.1-1-4.5-1.6-6.8-1.6C575,64.7,572.6,65.2,570.5,66.2z" />
+                            <path class="logo-white" d="M611.3,69.5c-3.5,0-6.3-2.8-6.3-6.3c0-3.5,2.8-6.3,6.3-6.3c3.5,0,6.3,2.8,6.3,6.3c0,0,0,0,0,0C617.6,66.6,614.7,69.5,611.3,69.5z M611.3,57.8c-3,0-5.4,2.4-5.4,5.3c0,3,2.4,5.4,5.4,5.4c3,0,5.3-2.4,5.3-5.3c0,0,0,0,0,0C616.6,60.2,614.3,57.8,611.3,57.8C611.3,57.8,611.3,57.8,611.3,57.8z M613,66.8l-1.9-2.9h-1.2v2.9h-1v-7.2h2.9c1.2-0.1,2.3,0.9,2.3,2.1c0,0,0,0,0,0.1c0,1.1-0.8,2-1.8,2.1l2,2.9L613,66.8z M611.8,60.5h-1.9v2.6h1.9c0.7,0,1.3-0.6,1.3-1.3S612.5,60.5,611.8,60.5C611.8,60.5,611.8,60.5,611.8,60.5z" />
+                        </svg>
+                    </Href>
+                    <Href href="https://dotnetfoundation.org/" NewWindow="true">
+                        <img src="/images/dotnet_foundation_logo-white.webp" alt=".NET Foundation" style="margin-top:30px;max-width:199px;width:80%" />
+                    </Href>
+                </div>
+                <div class="col" id="footer-why-col">
+                    <div class="pb-2 font-weight-bold">Why Steeltoe</div>
+                    <div><Href href="/why-steeltoe">Overview</Href></div>
+                    <div><Href href="/microservices">Microservices</Href></div>
+                    <div><Href href="/cloud">Cloud</Href></div>
+                    <div><Href href="/web-applications">Web Applications</Href></div>
+                    <div><Href href="/event-driven">Event Driven</Href></div>
+                </div>
+                <div class="col" id="footer-learn-col">
+                    <div class="pb-2 font-weight-bold">Learn</div>
+                    <div><Href href="/initializr" NewWindow="true">Steeltoe Initializr</Href></div>
+                    <div><Href href="@(DocsSiteOptions.Value.GuidesHome)">Guides</Href></div>
+                    <div><Href href="@(DocsSiteOptions.Value.DocsHome)">Documentation</Href></div>
+                    <div><Href href="@(DocsSiteOptions.Value.ApiBrowserHome)">API Browser</Href></div>
+                    <div><Href href="@(DocsSiteOptions.Value.BlogHome)">Blog</Href></div>
+                </div>
+                <div class="col" id="footer-projects-col">
+                    <div class="pb-2 font-weight-bold">Projects</div>
+                    <div><Href href="/app-configuration">Application Configuration</Href></div>
+                    <div><Href href="/circuit-breakers">Circuit Breakers</Href></div>
+                    <div><Href href="/logging">Dynamic Logging</Href></div>
+                    <div><Href href="/cloud-management">Management</Href></div>
+                    <div><Href href="/messaging">Messaging</Href></div>
+                    <div><Href href="@(DocsSiteOptions.Value.FileShareHome)">Network File Sharing</Href></div>
+                    <div><Href href="/security-providers">Security</Href></div>
+                    <div><Href href="/service-connectors">Service Connectors</Href></div>
+                    <div><Href href="/service-discovery">Service Discovery</Href></div>
+                    <div><Href href="@(DocsSiteOptions.Value.DocsStreamHome)">Stream</Href></div>
+                </div>
+                <div class="col" id="footer-others-col">
+                    @*<div class="pb-2 font-weight-bold"><Href href="/training">Training</Href></div>*@
+                    <div class="pb-2 font-weight-bold"><Href href="/support">Support</Href></div>
+                    <div class="pb-2 font-weight-bold"><Href href="/community">Community</Href></div>
+                </div>
             </div>
-            <div class="col">
-                <Href href="https://twitter.com/steeltoeoss" title="Steeltoe on Twitter" NewWindow="true">
-                    <svg id="twitter-icon" width="100px" height="50px" viewBox="0 0 115 75" xmlns="http://www.w3.org/2000/svg">
-                        <defs>
-                            <style>
-                                #twitter-icon .cls-1 {
-                                    fill: #ffffff;
-                                }
-
-                                #twitter-icon .cls-2 {
-                                    fill: #000000;
-                                }
-                            </style>
-                        </defs>
-                        <circle class="cls-1" cx="37.97" cy="37.97" r="37.97"></circle>
-                        <path class="cls-2" d="M55.2,22.73a15.43,15.43,0,0,1-4.88,1.91,7.56,7.56,0,0,0-5.61-2.49A7.78,7.78,0,0,0,37,30a7.56,7.56,0,0,0,.2,1.79,21.63,21.63,0,0,1-15.84-8.23,8,8,0,0,0,2.37,10.52,7.66,7.66,0,0,1-3.48-1v.09A7.84,7.84,0,0,0,26.45,41a7.54,7.54,0,0,1-2,.28A7.64,7.64,0,0,1,23,41.09a7.71,7.71,0,0,0,7.18,5.47,15.21,15.21,0,0,1-9.55,3.37,15.78,15.78,0,0,1-1.83-.11,21.41,21.41,0,0,0,11.78,3.54c14.13,0,21.86-12,21.86-22.42,0-.34,0-.68,0-1a15.67,15.67,0,0,0,3.83-4.08,14.9,14.9,0,0,1-4.41,1.24A7.8,7.8,0,0,0,55.2,22.73Z" data-name="Twitter" id="Twitter-2"></path>
-                    </svg>
-                </Href>
+            <div class="row py-sm-0 py-4">
+                <div class="col text-right">
+                    <Href href="https://github.com/SteeltoeOSS" title="Steeltoe on GitHub" NewWindow="true">
+                        <svg id="github-icon" width="100px" height="50px" viewBox="0 0 1 75" xmlns="http://www.w3.org/2000/svg">
+                            <defs>
+                                <style type="text/css">
+                                    #github-icon .cls-1 { fill: #ffffff; }
+                                    #github-icon .cls-2 { fill: #000000; fill-rule: evenodd; }
+                                </style>
+                            </defs>
+                            <path class="cls-1" d="M38,0a38,38,0,1,0,38,38A38,38,0,0,0,38,0Z"></path>
+                            <path class="cls-2" d="M38,15.59A22.95,22.95,0,0,0,30.71,60.3c1.15.21,1.57-.5,1.57-1.11s0-2,0-3.9c-6.38,1.39-7.73-3.07-7.73-3.07A6.09,6.09,0,0,0,22,48.86c-2.09-1.42.15-1.39.15-1.39a4.81,4.81,0,0,1,3.52,2.36c2,3.5,5.37,2.49,6.67,1.91a4.87,4.87,0,0,1,1.46-3.07c-5.09-.58-10.45-2.55-10.45-11.34a8.84,8.84,0,0,1,2.36-6.15,8.29,8.29,0,0,1,.23-6.07s1.92-.62,6.3,2.35a21.82,21.82,0,0,1,11.49,0c4.38-3,6.3-2.35,6.3-2.35a8.29,8.29,0,0,1,.23,6.07,8.84,8.84,0,0,1,2.36,6.15c0,8.81-5.37,10.75-10.48,11.32a5.46,5.46,0,0,1,1.56,4.25c0,3.07,0,5.54,0,6.29s.42,1.33,1.58,1.1A22.94,22.94,0,0,0,38,15.59Z"></path>
+                        </svg>
+                    </Href>
+                </div>
+                <div class="col">
+                    <Href href="https://twitter.com/steeltoeoss" title="Steeltoe on Twitter" NewWindow="true">
+                        <svg id="twitter-icon" width="100px" height="50px" viewBox="0 0 115 75" xmlns="http://www.w3.org/2000/svg">
+                            <defs>
+                                <style type="text/css">
+                                    #twitter-icon .cls-1 { fill: #ffffff; }
+                                    #twitter-icon .cls-2 { fill: #000000; }
+                                </style>
+                            </defs>
+                            <circle class="cls-1" cx="37.97" cy="37.97" r="37.97"></circle>
+                            <path class="cls-2" d="M55.2,22.73a15.43,15.43,0,0,1-4.88,1.91,7.56,7.56,0,0,0-5.61-2.49A7.78,7.78,0,0,0,37,30a7.56,7.56,0,0,0,.2,1.79,21.63,21.63,0,0,1-15.84-8.23,8,8,0,0,0,2.37,10.52,7.66,7.66,0,0,1-3.48-1v.09A7.84,7.84,0,0,0,26.45,41a7.54,7.54,0,0,1-2,.28A7.64,7.64,0,0,1,23,41.09a7.71,7.71,0,0,0,7.18,5.47,15.21,15.21,0,0,1-9.55,3.37,15.78,15.78,0,0,1-1.83-.11,21.41,21.41,0,0,0,11.78,3.54c14.13,0,21.86-12,21.86-22.42,0-.34,0-.68,0-1a15.67,15.67,0,0,0,3.83-4.08,14.9,14.9,0,0,1-4.41,1.24A7.8,7.8,0,0,0,55.2,22.73Z" data-name="Twitter" id="Twitter-2"></path>
+                        </svg>
+                    </Href>
+                </div>
             </div>
-        </div>
-        <div class="row align-items-center no-gutters pt-0">
-            <div class="col text-center my-2 small text-muted">
-                Copyright &copy; 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term &quot;Broadcom&quot; refers to Broadcom Inc. and/or its subsidiaries.<br />
-                &bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/privacy.html" NewWindow="true">Privacy&nbsp;Policy</Href>
-                &bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/privacy/california-privacy-rights.html" NewWindow="true">Your&nbsp;California&nbsp;Privacy&nbsp;Rights</Href>
-                &bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/legal.html" NewWindow="true">Terms&nbsp;of&nbsp;Use</Href>
-                &bull;&nbsp;<Href Class="text-muted" href="/SteeltoeTrademarkGuidelines.pdf" NewWindow="true">Trademark&nbsp;Guidelines</Href>
+            <div class="row align-items-center no-gutters pt-0">
+                <div class="col text-center my-2 small text-muted">
+                    Copyright &copy; 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term &quot;Broadcom&quot; refers to Broadcom Inc. and/or its subsidiaries.<br />
+                    &bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/privacy.html" NewWindow="true">Privacy&nbsp;Policy</Href>
+                    &bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/privacy/california-privacy-rights.html" NewWindow="true">Your&nbsp;California&nbsp;Privacy&nbsp;Rights</Href>
+                    &bull;&nbsp;<Href Class="text-muted" href="https://www.vmware.com/help/legal.html" NewWindow="true">Terms&nbsp;of&nbsp;Use</Href>
+                    &bull;&nbsp;<Href Class="text-muted" href="/SteeltoeTrademarkGuidelines.pdf" NewWindow="true">Trademark&nbsp;Guidelines</Href>
+                </div>
             </div>
         </div>
     </div>
-</div>
-
-@code {
-
-    private DocsSiteOptions _docsSite;
-
-    protected override void OnInitialized()
-    {
-        _docsSite = DocsSiteOptions?.Value ?? throw new ArgumentNullException(nameof(_docsSite));
-    }
-}
+</footer>
diff --git a/src/Client/Components/Layout/SiteHeader.razor b/src/Client/Components/Layout/SiteHeader.razor
index f2612c0..4c0a0c8 100644
--- a/src/Client/Components/Layout/SiteHeader.razor
+++ b/src/Client/Components/Layout/SiteHeader.razor
@@ -1,75 +1,66 @@
-@using Microsoft.Extensions.Options
-
 @inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
 
-<nav class="bg-white navbar navbar-expand-xl container py-xl-2 navbar-light">
-    <Href class="navbar-brand" href="/">
-        <img id="logo" class="svg" src="/images/logo.svg" alt="Steeltoe" style="width:211px">
-    </Href>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbar">
-        <ul class="navbar-nav text-center">
-            <li class="nav-item dropdown ml-xl-5 mr-xl-2">
-                <a class="nav-link dropdown-toggle" href="#" id="why" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
-                    Why Steeltoe
-                </a>
-                <div class="dropdown-menu" aria-labelledby="why">
-                    <Href class="dropdown-item" href="/why-steeltoe">Overview</Href>
-                    <Href class="dropdown-item" href="/microservices">Microservices</Href>
-                    <Href class="dropdown-item" href="/cloud">Cloud</Href>
-                    <Href class="dropdown-item" href="/web-application">Web Applications</Href>
-                    <Href class="dropdown-item" href="/event-driven">Event Driven</Href>
-                </div>
-            </li>
-            <li class="nav-item dropdown mx-xl-2">
-                <a class="nav-link dropdown-toggle" href="#" id="learn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
-                    Get Started
-                </a>
-                <div class="dropdown-menu" aria-labelledby="learn">
-                    <Href class="dropdown-item" href="https://start.steeltoe.io/" NewWindow>Steeltoe Initializr</Href>
-                    <Href class="dropdown-item" href="@(_docsSite.GuidesHome)">Guides</Href>
-                    <Href class="dropdown-item" href="@(_docsSite.DocsHome)">Documentation</Href>
-                    <Href class="dropdown-item" href="@(_docsSite.ApiBrowserHome)">API Browser</Href>
-                    <Href class="dropdown-item" href="@(_docsSite.BlogHome)">Blog</Href>
-                </div>
-            </li>
-            <li class="nav-item dropdown mx-xl-2">
-                <a class="nav-link dropdown-toggle" href="#" id="projects" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
-                    Projects
-                </a>
-                <div class="dropdown-menu" aria-labelledby="projects">
-                    <Href class="dropdown-item" href="/app-configuration">Steeltoe Application Configuration</Href>
-                    <Href class="dropdown-item" href="/circuit-breakers">Steeltoe Circuit Breakers</Href>
-                    <Href class="dropdown-item" href="/docs/logging">Steeltoe Dynamic Logging</Href>
-                    <Href class="dropdown-item" href="/cloud-management">Steeltoe Management</Href>
-                    <Href class="dropdown-item" href="/messaging">Steeltoe Messaging</Href>
-                    <Href class="dropdown-item" href="@(_docsSite.FileShareHome)">Steeltoe Network File Sharing</Href>
-                    <Href class="dropdown-item" href="/security-providers">Steeltoe Security</Href>
-                    <Href class="dropdown-item" href="/service-connectors">Steeltoe Service Connectors</Href>
-                    <Href class="dropdown-item" href="/service-discovery">Steeltoe Service Discovery</Href>
-                    <Href class="dropdown-item" href="@(_docsSite.DocsStreamHome)">Steeltoe Stream</Href>
-                </div>
-            </li>
-            @*<li class="nav-item mx-xl-2">
-                    <Href class="nav-link" href="/training">Training</Href>
+<header class="sticky-top bg-white" style="box-shadow: 0 0 20px -4px #eeeeee;">
+    <nav class="bg-white navbar navbar-expand-xl container py-xl-2 navbar-light">
+        <Href class="navbar-brand" href="/">
+            <img id="logo" class="svg" src="/images/logo.svg" alt="Steeltoe" style="width:211px">
+        </Href>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbar">
+            <ul class="navbar-nav text-center">
+                <li class="nav-item dropdown ml-xl-5 mr-xl-2">
+                    <a class="nav-link dropdown-toggle" href="#" id="why" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
+                        Why Steeltoe
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="why">
+                        <Href class="dropdown-item" href="/why-steeltoe">Overview</Href>
+                        <Href class="dropdown-item" href="/microservices">Microservices</Href>
+                        <Href class="dropdown-item" href="/cloud">Cloud</Href>
+                        <Href class="dropdown-item" href="/web-application">Web Applications</Href>
+                        <Href class="dropdown-item" href="/event-driven">Event Driven</Href>
+                    </div>
+                </li>
+                <li class="nav-item dropdown mx-xl-2">
+                    <a class="nav-link dropdown-toggle" href="#" id="learn" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
+                        Get Started
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="learn">
+                        <Href class="dropdown-item" href="/initializr" NewWindow>Steeltoe Initializr</Href>
+                        <Href class="dropdown-item" href="@(DocsSiteOptions.Value.GuidesHome)">Guides</Href>
+                        <Href class="dropdown-item" href="@(DocsSiteOptions.Value.DocsHome)">Documentation</Href>
+                        <Href class="dropdown-item" href="@(DocsSiteOptions.Value.ApiBrowserHome)">API Browser</Href>
+                        <Href class="dropdown-item" href="@(DocsSiteOptions.Value.BlogHome)">Blog</Href>
+                    </div>
+                </li>
+                <li class="nav-item dropdown mx-xl-2">
+                    <a class="nav-link dropdown-toggle" href="#" id="projects" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" onclick="return false;">
+                        Projects
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="projects">
+                        <Href class="dropdown-item" href="/app-configuration">Steeltoe Application Configuration</Href>
+                        <Href class="dropdown-item" href="/circuit-breakers">Steeltoe Circuit Breakers</Href>
+                        <Href class="dropdown-item" href="/docs/logging">Steeltoe Dynamic Logging</Href>
+                        <Href class="dropdown-item" href="/cloud-management">Steeltoe Management</Href>
+                        <Href class="dropdown-item" href="/messaging">Steeltoe Messaging</Href>
+                        <Href class="dropdown-item" href="@(DocsSiteOptions.Value.FileShareHome)">Steeltoe Network File Sharing</Href>
+                        <Href class="dropdown-item" href="/security-providers">Steeltoe Security</Href>
+                        <Href class="dropdown-item" href="/service-connectors">Steeltoe Service Connectors</Href>
+                        <Href class="dropdown-item" href="/service-discovery">Steeltoe Service Discovery</Href>
+                        <Href class="dropdown-item" href="@(DocsSiteOptions.Value.DocsStreamHome)">Steeltoe Stream</Href>
+                    </div>
+                </li>
+                @*<li class="nav-item mx-xl-2">
+                <Href class="nav-link" href="/training">Training</Href>
                 </li>*@
-            <li class="nav-item mx-xl-2">
-                <Href class="nav-link" href="/support">Support</Href>
-            </li>
-            <li class="nav-item mx-xl-2">
-                <Href class="nav-link" href="/community">Community</Href>
-            </li>
-        </ul>
-    </div>
-</nav>
-
-@code {
-    private DocsSiteOptions _docsSite;
-
-    protected override void OnInitialized()
-    {
-        _docsSite = DocsSiteOptions?.Value ?? throw new ArgumentNullException(nameof(_docsSite));
-    }
-}
+                <li class="nav-item mx-xl-2">
+                    <Href class="nav-link" href="/support">Support</Href>
+                </li>
+                <li class="nav-item mx-xl-2">
+                    <Href class="nav-link" href="/community">Community</Href>
+                </li>
+            </ul>
+        </div>
+    </nav>
+</header>
diff --git a/src/Client/Components/Note.razor b/src/Client/Components/Note.razor
index 23dac12..9212bb2 100644
--- a/src/Client/Components/Note.razor
+++ b/src/Client/Components/Note.razor
@@ -1,18 +1,17 @@
-<div class="note">
- <div class="row" style="background-color:#3b89d8">
-  <div class="col note-title">note</div>
- </div>
- <div class="row" style="background-color:#f0f6fc">
-  <div class="col note-desc">
-   @Message 
-  @ChildContent
-  </div>
- </div>
+<div class="note">
+    <div class="row" style="background-color:#3b89d8">
+        <div class="col note-title">note</div>
+    </div>
+    <div class="row" style="background-color:#f0f6fc">
+        <div class="col note-desc">
+            @Message 
+            @ChildContent
+        </div>
+    </div>
 </div>
 
-@code {
-	[Parameter]
-	public RenderFragment Message { get; set; } = null;
-	[Parameter]
-	public RenderFragment ChildContent { get; set; } = null;
+@code
+{
+	[Parameter] public RenderFragment Message { get; set; }
+	[Parameter] public RenderFragment ChildContent { get; set; }
 }
diff --git a/src/Client/Components/Pages/AppConfiguration/Cloudfoundry.razor b/src/Client/Components/Pages/AppConfiguration/Cloudfoundry.razor
deleted file mode 100644
index a940b49..0000000
--- a/src/Client/Components/Pages/AppConfiguration/Cloudfoundry.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/app-configuration/get-started/cloudfoundry"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Cloud Foundry Provider"
-							 ParentLinkName="App Configuration"
-							 ParentLinkUrl="/app-configuration"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/cloud-foundry.html")">Cloud Foundry configuration guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/cloud-foundry.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/AppConfiguration/GettingStarted.razor b/src/Client/Components/Pages/AppConfiguration/GettingStarted.razor
deleted file mode 100644
index 2cfe7bc..0000000
--- a/src/Client/Components/Pages/AppConfiguration/GettingStarted.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/app-configuration/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-							 ParentLinkName="App Configuration"
-							 ParentLinkUrl="/app-configuration" />
-<GetStarted>
-    <ComponentName>App Configuration</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/AppConfiguration/Index.razor b/src/Client/Components/Pages/AppConfiguration/Index.razor
index 3e7eb1d..9692c0a 100644
--- a/src/Client/Components/Pages/AppConfiguration/Index.razor
+++ b/src/Client/Components/Pages/AppConfiguration/Index.razor
@@ -2,59 +2,63 @@
 @page "/app-config"
 @page "/steeltoe-configuration"
 
-<Template Name="Application Configuration" Features="@features" DocsURL="/docs/configuration">
-	<Description>Separating configuration from application code is an important discipline in cloud-native development. Spring Cloud Config Server provides a mechanism to store your application’s configuration externally, and have it injected into your application at runtime. Steeltoe includes a custom .NET Configuration Provider that utilizes Spring Cloud Config Server to pull in config values stored in Git, the filesystem, or HashiCorp Vault.</Description>
-	<WhatIs>Steeltoe Configuration builds on the new .NET configuration API, which enables developers to configure an application with values from a variety of sources by using Configuration Providers.</WhatIs>
+<Template Name="Application Configuration" Features="@_features" DocsUrl="/docs/configuration" MetaDescription="Steeltoe offers .NET configuration providers for placeholder resolution, random value generation, working with Spring Cloud Config Server, Cloud Foundry environments and more.">
+    <Description>
+        Separating configuration from application code is an important discipline in cloud-native development.
+        Spring Cloud Config Server provides a mechanism to store your application&apos;s configuration externally, and have it injected into your application at runtime.
+        Steeltoe includes a custom .NET Configuration Provider that utilizes Spring Cloud Config Server to pull in config values stored in Git, the filesystem, or HashiCorp Vault.
+    </Description>
+	<WhatIs>Steeltoe Configuration builds on the .NET configuration API, which enables developers to configure an application with values from a variety of sources by using Configuration Providers.</WhatIs>
 	<WhyUse>With the added providers, Steeltoe Configuration takes care of managing connections to external config servers and provides new resources, such as placeholders and random values.</WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
-			Title = (MarkupString)"Spring Config Server Provider",
-			Description = (b => {
-				b.AddMarkupContent(1,"Enable a .NET application to use a Spring Cloud Config server as a provider.");
-			}),
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
+			Title = (MarkupString)"Spring Cloud Config Server",
+			Description = b => {
+                b.AddMarkupContent(1,"Enable a .NET application to use Spring Cloud Config server as a configuration provider.");
+            },
 			Img = "/images/icon-spring-cloud.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Placeholders in Configuration",
-			Description = (b => {
-				b.AddMarkupContent(1,"Define configuration values as placeholders in your configuration and have them resolved to real values at runtime during configuration access.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Define configuration values as placeholders in your configuration and have them resolved to real values at runtime during configuration access.");
+            },
 			Img = "/images/Icon_down-arrow.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Random Values",
-			Description = (b => {
-				b.AddMarkupContent(1,"Generate random values as integers, longs, UUIDs or strings as part of your application's configuration values.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Generate random values as integers, longs, UUIDs or strings as part of your application's configuration values.");
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		},
-		new Feature() {
-			Title = (MarkupString)"Cloud Foundry Provider",
-			Description = (b => {
-				b.AddMarkupContent(1,"A custom .NET provider for the Cloud Foundry platform that parses the VCAP environment variables and automatically loads them as configuration values.");
-			}),
+		new Feature
+        {
+			Title = (MarkupString)"Cloud Foundry",
+			Description = b => {
+                b.AddMarkupContent(1,"A custom .NET Configuration provider for the Cloud Foundry platform that parses the VCAP environment variables and automatically loads them as configuration values.");
+            },
 			Img = "/images/cloud-foundry.png"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/AppConfiguration/Placeholder.razor b/src/Client/Components/Pages/AppConfiguration/Placeholder.razor
deleted file mode 100644
index 99dbf8f..0000000
--- a/src/Client/Components/Pages/AppConfiguration/Placeholder.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/app-configuration/get-started/placeholder"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Placeholder Provider"
-							 ParentLinkName="App Configuration"
-							 ParentLinkUrl="/app-configuration"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/placeholder.html")">Placeholder configuration provider guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/placeholder.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/AppConfiguration/Randomvalue.razor b/src/Client/Components/Pages/AppConfiguration/Randomvalue.razor
deleted file mode 100644
index ee2665c..0000000
--- a/src/Client/Components/Pages/AppConfiguration/Randomvalue.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/app-configuration/get-started/randomvalue"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Random Value Provider"
-							 ParentLinkName="App Configuration"
-							 ParentLinkUrl="/app-configuration"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/random-value.html")">random value configuration provider guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/random-value.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/AppConfiguration/Redirects.razor b/src/Client/Components/Pages/AppConfiguration/Redirects.razor
new file mode 100644
index 0000000..b15cff5
--- /dev/null
+++ b/src/Client/Components/Pages/AppConfiguration/Redirects.razor
@@ -0,0 +1,25 @@
+@page "/app-configuration/get-started/{Provider}"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    [Parameter] public string Provider { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/application-configuration/{TranslateProviderName(Provider)}.html");
+    }
+
+    private static string TranslateProviderName(string provider)
+    {
+        return provider.ToLower() switch
+        {
+            "cloudfoundry" => "cloud-foundry",
+            "randomvalue" => "random-value",
+            "springconfig" => "spring-config",
+            _ => provider
+        };
+    }
+}
diff --git a/src/Client/Components/Pages/AppConfiguration/Springconfig.razor b/src/Client/Components/Pages/AppConfiguration/Springconfig.razor
deleted file mode 100644
index 82bc9d2..0000000
--- a/src/Client/Components/Pages/AppConfiguration/Springconfig.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/app-configuration/get-started/springconfig"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Spring Config Provider"
-							 ParentLinkName="App Configuration"
-							 ParentLinkUrl="/app-configuration"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/spring-config.html")">Spring Cloud Config Server guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/application-configuration/spring-config.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Blog.razor b/src/Client/Components/Pages/Blog.razor
index 5d58ee8..6fc3ffa 100644
--- a/src/Client/Components/Pages/Blog.razor
+++ b/src/Client/Components/Pages/Blog.razor
@@ -1,30 +1,23 @@
-@inject IHttpContextAccessor HttpContextAccessor
+@inject NavigationManager NavigationManager
 @inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
 
 @page "/blog"
 @page "/blogs"
 @page "/blog/{ArticleName}"
 @page "/blog/{Area}/{ArticleName}"
-Redirecting to new docs site, please hold.
 
-@code {
-    [Parameter]
-    public string ArticleName { get; set; }
+@code
+{
+    [Parameter] public string ArticleName { get; set; } = "index";
 
-    [Parameter]
-    public string Area { get;set; }
+    [Parameter] public string Area { get; set; }
 
-    protected override void OnInitialized()
+    protected override void OnParametersSet()
     {
-        ArticleName ??= "index";
-
         var uri = Area != null
-            ? new Uri(DocsSiteOptions.Value.BaseAddress + $"/articles/{Area}/{ArticleName}.html")
-            : new Uri(DocsSiteOptions.Value.BaseAddress + $"/articles/{ArticleName}.html");
+            ? $"{DocsSiteOptions.Value.BaseAddress}/articles/{Area}/{ArticleName}.html"
+            : $"{DocsSiteOptions.Value.BaseAddress}/articles/{ArticleName}.html";
 
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            HttpContextAccessor.HttpContext.Response.Redirect(uri.ToString(), true);
-        }
+        NavigationManager.NavigateTo(uri);
     }
 }
diff --git a/src/Client/Components/Pages/CircuitBreakers/Breaker.razor b/src/Client/Components/Pages/CircuitBreakers/Breaker.razor
deleted file mode 100644
index 1d9dde6..0000000
--- a/src/Client/Components/Pages/CircuitBreakers/Breaker.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/circuit-breakers/get-started/breaker"
-@page "/circuit-breakers/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Circuit Breakers"
-						 ParentLinkName="Circuit Breakers"
-						 ParentLinkUrl="/circuit-breakers"
-						 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/circuit-breaker/circuit-breaker.html")">circuit breaker guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/circuit-breaker/circuit-breaker.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/CircuitBreakers/Index.razor b/src/Client/Components/Pages/CircuitBreakers/Index.razor
index 5b5cf8d..a42aca4 100644
--- a/src/Client/Components/Pages/CircuitBreakers/Index.razor
+++ b/src/Client/Components/Pages/CircuitBreakers/Index.razor
@@ -1,45 +1,54 @@
-@page "/circuit-breakers"
+@page "/circuit-breakers"
 @page "/steeltoe-circuitbreaker"
 
-<Template Name="Circuit Breakers" Features="@features" DocsURL="/docs/circuitbreaker">
-	<Description>What do you do when a service you depend on stops responding? Circuit breakers enable you to bypass a failing service, allowing it time to recover, and preventing your users from seeing nasty error messages. Steeltoe includes a .NET implementation of Netflix Hystrix, a proven circuit breaker implementation with rich metrics and monitoring features.</Description>
-	<WhatIs>When applied to a service, a circuit breaker watches for failing calls to the service. If failures reach a certain threshold, it “opens” (or breaks) the circuit and automatically redirects calls to the specified fallback mechanism. This gives the failing service time to recover. By using Circuit Breaker frameworks, you can prevent failures from cascading and provide fallback behavior until a failing service is restored to normal operation.</WhatIs>
+<Banner BannerTypeName="Deprecation Notice" Href="https://github.com/SteeltoeOSS/Steeltoe/issues/1244">
+    This component has been discontinued from Steeltoe v4. Please click here to read more and provide feedback.
+</Banner>
+
+<Template Name="Circuit Breaker" Features="@_features" DocsUrl="/docs/circuitbreaker" MetaDescription="Prevent cascading failures in .NET applications with Steeltoe Circuit Breaker.">
+    <Description>
+        What do you do when a service you depend on stops responding? Circuit breakers enable you to bypass a failing service, allowing it time to recover, and preventing your users from seeing nasty error messages.
+        Steeltoe includes a .NET implementation of Netflix Hystrix, a proven circuit breaker implementation with rich metrics and monitoring features.
+    </Description>
+    <WhatIs>
+        When applied to a service, a circuit breaker watches for failing calls to the service.
+        If failures reach a certain threshold, it &quot;opens&quot; (or breaks) the circuit and automatically redirects calls to the specified fallback mechanism.
+        This gives the failing service time to recover. By using Circuit Breaker frameworks, you can prevent failures from cascading and provide fallback behavior until a failing service is restored to normal operation.
+    </WhatIs>
 	<WhyUse>Based on Netflix Hystrix circuit breaker pattern, Steeltoe Circuit Breakers provides applications with an implementation of the same pattern. No external dependencies are introduced by this package, your application can manage circuits completely internal.</WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Based on a proven pattern",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe support a similar design to Spring Cloud Netflix based on Hystrix, Netflix’s Latency and Fault Tolerance library for distributed systems.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe support a similar design to Spring Cloud Netflix based on Hystrix, Netflix&apos;s Latency and Fault Tolerance library for distributed systems.");
+            },
 			Img = "/images/icon-spring-cloud.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Internal to your application",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe Circuit Breakers is a pure .NET implementation. Meaning all your app will need is this package.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe Circuit Breakers is a pure .NET implementation. Meaning all your app will need is this package.");
+            },
 			Img = "/images/Icon_upload.svg"
 		}
-	};
-}
\ No newline at end of file
+    ];
+}
diff --git a/src/Client/Components/Pages/CircuitBreakers/Redirects.razor b/src/Client/Components/Pages/CircuitBreakers/Redirects.razor
new file mode 100644
index 0000000..6701dbd
--- /dev/null
+++ b/src/Client/Components/Pages/CircuitBreakers/Redirects.razor
@@ -0,0 +1,12 @@
+@page "/circuit-breakers/get-started/breaker"
+@page "/circuit-breakers/get-started"
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/circuit-breaker/circuit-breaker.html");
+    }
+}
diff --git a/src/Client/Components/Pages/Cloud.razor b/src/Client/Components/Pages/Cloud.razor
index 1d23614..32e1f84 100644
--- a/src/Client/Components/Pages/Cloud.razor
+++ b/src/Client/Components/Pages/Cloud.razor
@@ -1,82 +1,52 @@
-@page "/cloud"
+@page "/cloud"
 
-<Template Name="Cloud" Features="@features">
-	<Description>Developing distributed systems can be challenging. Complexity is moved from the application layer to the network layer and demands greater interaction between services. Making your code ‘cloud-native’ means dealing with <Href href="https://12factor.net" NewWindow="true">12-factor</Href> issues such as external configuration, statelessness, logging, and connecting to backing services. Steeltoe with Spring Cloud suite of projects contains many of the services you need to make your applications run in the cloud.</Description>
+<Template Name="Cloud" Features="@_features" MetaDescription="Level up your .NET code and explore what Steeltoe can do for you.">
+    <Description>
+        Developing distributed systems can be challenging. Complexity is moved from the application layer to the network layer and demands greater interaction between services.
+        Making your code &apos;cloud-native&apos; means dealing with <Href href="https://12factor.net" NewWindow="true">12-factor</Href> issues such as external configuration, statelessness, logging, and connecting to backing services.
+        Steeltoe with Spring Cloud suite of projects contains many of the services you need to make your applications run in the cloud.
+    </Description>
 	<FeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
+			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
 		</div>
 	</FeatureTemplate>
 	<AltFeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
+			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
 		</div>
 	</AltFeatureTemplate>
-	<!-- OtherArea>
-		<div class="col text-center m-5">
-			<div class="mb-5"><h2>Ready to get started?</h2></div>
-			<div class=""><Href href="/get-started" AsButton="true">TRY THESE TUTORIALs</Href></div>
-		</div>
-	</OtherArea -->
 </Template>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Service discovery",
-			Description = (b => {
-				b.AddMarkupContent(1,"In the cloud, applications can’t always know the exact location of other services. A service registry, such as Netflix Eureka or HashiCorp Consul, can help. Steeltoe provides clients for both as well as Spring Config, a C# implementation of circuit breakers, and many other components.<br /><br />");
-//				b.OpenComponent<Href>(2);
-//					b.AddAttribute(3, "href","/service-discovery/get-started");
-//					b.AddAttribute(4, "AsButton",true);
-//					b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Get started with Steeltoe Discovery");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"In the cloud, applications can&apos;t always know the exact location of other services. A service registry, such as Netflix Eureka or HashiCorp Consul, can help. Steeltoe provides clients for both as well as Spring Config, a C# implementation of circuit breakers, and many other components.<br /><br />");
+            },
 			Img = "/images/Icon_tool.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Cloud configuration",
-			Description = (b => {
-				b.AddMarkupContent(1,"In the cloud, configuration can’t simply be embedded inside the application. The configuration has to be flexible enough to cope with multiple applications, environments, and service instances, as well as deal with dynamic changes without downtime. Spring Cloud Config is designed to ease these burdens and offers integration with version control systems like Git to help you keep your configuration safe.<br /><br />");
-//				b.OpenComponent<Href>(2);
-//					b.AddAttribute(3, "href","/app-configuration/get-started");
-//					b.AddAttribute(4, "AsButton",true);
-//					b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Get started with Steeltoe Config");}));
-//				b.CloseComponent();
-			}),
-			Img = "/images/Icon_data-transfer.svg"
-		},
-		new Feature() {
-			Title = (MarkupString)"Circuit breakers",
-			Description = (b => {
-				b.AddMarkupContent(1,"Distributed systems can be unreliable. Requests might encounter timeouts or fail completely. A circuit breaker can help mitigate these issues, and Spring Cloud Circuit Breaker gives you the choice of three popular options: Resilience4J, Sentinel, or Hystrix.<br /><br />");
-//				b.OpenComponent<Href>(2);
-//					b.AddAttribute(3, "href","/circuit-breaker/get-started");
-//					b.AddAttribute(4, "AsButton",true);
-//					b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Get started with Steeltoe Circuit Breaker");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"In the cloud, configuration can&apos;t simply be embedded inside the application. The configuration has to be flexible enough to cope with multiple applications, environments, and service instances, as well as deal with dynamic changes without downtime. Spring Cloud Config is designed to ease these burdens and offers integration with version control systems like Git to help you keep your configuration safe.<br /><br />");
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Tracing",
-			Description = (b => {
-				b.AddMarkupContent(1,"Debugging distributed applications can be complex and take a long time. For any given failure, you might need to piece together traces of information from several independent services. Spring Cloud Sleuth can instrument your applications in a predictable and repeatable way. And when used in conjunction with Zipkin, you can zero in on any latency problems you might have.<br /><br />");
-//				b.OpenComponent<Href>(2);
-//					b.AddAttribute(3, "href","/cloud-management/get-started/distributed-tracing");
-//					b.AddAttribute(4, "AsButton",true);
-//					b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Get started with Steeltoe Distributed Tracing");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Debugging distributed applications can be complex and take a long time. For any given failure, you might need to piece together traces of information from several independent services. Spring Cloud Sleuth can instrument your applications in a predictable and repeatable way. And when used in conjunction with Zipkin, you can zero in on any latency problems you might have.<br /><br />");
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		}
-	};
-}
\ No newline at end of file
+    ];
+}
diff --git a/src/Client/Components/Pages/Community.razor b/src/Client/Components/Pages/Community.razor
index 5a4b2be..1af3958 100644
--- a/src/Client/Components/Pages/Community.razor
+++ b/src/Client/Components/Pages/Community.razor
@@ -1,6 +1,6 @@
-@page "/community"
+@page "/community"
 
-<Template Name="Community">
+<Template Name="Community" MetaDescription="Connect with other developers and share your project with the Steeltoe community.">
 	<Description>Connect with other developers and share your project with the Steeltoe community.</Description>
 	<OtherArea>
 		<div class="row no-gutters">
@@ -28,7 +28,10 @@
 				<div class="component-whatis-title"><h2>Developers</h2></div>
 				<div class="my-5">
 					<div><Href href="https://slack.steeltoe.io" NewWindow="true">Steeltoe Slack</Href></div>
-					<div>Slack is the best place to get your questions answered, contribute to conversations, and find the latest information about the Steeltoe project. If you have trouble joining, try <a href="https://join.slack.com/t/steeltoeteam/shared_invite/zt-1cd7lh4pi-BlfQsI6nEDEX2qbh5JrRZw">this link</a> or <a href="mailto:info@steeltoe.io?subject=Slack%20Invite">email us</a>.</div>
+                    <div>
+                        Slack is the best place to get your questions answered, contribute to conversations, and find the latest information about the Steeltoe project.
+                        If you have trouble joining, try <a href="https://join.slack.com/t/steeltoeteam/shared_invite/zt-1cd7lh4pi-BlfQsI6nEDEX2qbh5JrRZw">this link</a> or <a href="mailto:info@steeltoe.io?subject=Slack%20Invite">email us</a>.
+                    </div>
 				</div>
 				<div class="my-5">
 					<div><Href href="https://stackoverflow.com/questions/tagged/steeltoe" NewWindow="true">Stack Overflow</Href></div>
@@ -46,6 +49,3 @@
 		</div>
 	</OtherArea>
 </Template>
-
-@code{
-}
diff --git a/src/Client/Components/Pages/Doc.razor b/src/Client/Components/Pages/Doc.razor
index de5b63b..84ba532 100644
--- a/src/Client/Components/Pages/Doc.razor
+++ b/src/Client/Components/Pages/Doc.razor
@@ -15,45 +15,25 @@
 @page "/docs/{Version:int}/{Component}/{Area}"
 Redirecting to new docs site, please hold.
 
-@code {
-    private string _area;
-    private string _component;
+@code
+{
     private int _version;
     private const int CurrentVersion = 3;
-    private const string DefaultArea = "index";
     private const string DefaultComponent = "welcome";
-    private DocsSiteOptions _docsSite;
 
-#pragma warning disable BL0007
-    [Parameter]
-    public string Area
-    {
-        get => _area ?? DefaultArea;
-        set => _area = value;
-    }
+    [Parameter] public string Area { get; set; } = "index";
 
-    [Parameter]
-    public string Component
-    {
-        get => _component ?? DefaultComponent;
-        set => _component = value;
-    }
+    [Parameter] public string Component { get; set; } = DefaultComponent;
 
     [Parameter]
     public int Version
     {
         get => _version;
-        set => _version = (value is < 2 or > 3 or 0 ? CurrentVersion : value);
-    }
-#pragma warning restore BL0007
-
-    protected override void OnInitialized()
-    {
-        _docsSite = DocsSiteOptions?.Value ?? throw new ArgumentNullException(nameof(_docsSite));
+        set => _version = value is < 2 or > 3 ? CurrentVersion : value;
     }
 
     protected override void OnParametersSet()
     {
-        NavigationManager.NavigateTo($"{_docsSite.BaseAddress}/api/v{Version}/{Component}/{Area}.html", true);
+        NavigationManager.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/api/v{Version}/{Component}/{Area}.html", true);
     }
 }
diff --git a/src/Client/Components/Pages/DynamicLogging/Index.razor b/src/Client/Components/Pages/DynamicLogging/Index.razor
deleted file mode 100644
index 999fbfa..0000000
--- a/src/Client/Components/Pages/DynamicLogging/Index.razor
+++ /dev/null
@@ -1,27 +0,0 @@
-@page "/logging/get-started"
-@page "/dynamic-logging"
-@page "/steeltoe-logging"
-
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-						 ParentLinkName="Logging"
-						 ParentLinkUrl="/logging" />
-<GetStarted>
-    <ComponentName>Logging</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.DynamicLoggingHome)">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.DynamicLoggingHome).ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/DynamicLogging/Redirects.razor b/src/Client/Components/Pages/DynamicLogging/Redirects.razor
new file mode 100644
index 0000000..33bba03
--- /dev/null
+++ b/src/Client/Components/Pages/DynamicLogging/Redirects.razor
@@ -0,0 +1,14 @@
+@page "/logging/get-started"
+@page "/dynamic-logging"
+@page "/steeltoe-logging"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo(DocsSiteOptions.Value.DynamicLoggingHome);
+    }
+}
diff --git a/src/Client/Components/Pages/Error.razor b/src/Client/Components/Pages/Error.razor
index c760fde..8985b9f 100644
--- a/src/Client/Components/Pages/Error.razor
+++ b/src/Client/Components/Pages/Error.razor
@@ -13,7 +13,8 @@
     </p>
 }
 
-@code{
+@code
+{
     [CascadingParameter]
 #nullable enable
     private HttpContext? HttpContext { get; set; }
diff --git a/src/Client/Components/Pages/Event-Driven.razor b/src/Client/Components/Pages/Event-Driven.razor
index c198964..1c44ee1 100644
--- a/src/Client/Components/Pages/Event-Driven.razor
+++ b/src/Client/Components/Pages/Event-Driven.razor
@@ -1,79 +1,67 @@
 @page "/event-driven"
 
-<Template Name="Event Driven" Features="@features" NameIsPlural="false">
-	<Description>Event-driven systems reflect how modern businesses actually work, with thousands of small changes happening all day, every day. Steeltoe’s ability to handle events and enable developers to build applications around them, means your apps will stay in sync with your business. Steeltoe has event-driven options like streaming all the way to cloud functions, and data flows.</Description>
-	<WhatIs>When combined with microservices, event streaming opens up exciting opportunities - like event-driven architectures. Steeltoe simplifies the production, processing, and consumption of events, providing several useful abstractions</WhatIs>
-	<WhyUse>The bedrock of any event-driven system is message handling. Connecting to message platforms, routing messages, transforming messages, processing messages. With Steeltoe you can solve these integration challenges quickly and easily.</WhyUse>
+<Banner BannerTypeName="Deprecation Notice" Href="https://github.com/SteeltoeOSS/Steeltoe/issues/1244">
+    These components have been discontinued from Steeltoe v4. Please click here to read more and provide feedback.
+</Banner>
+
+<Template Name="Event Driven" Features="@_features" NameIsPlural="false" MetaDescription="Use Steeltoe Messaging and Stream components to build event-driven applications.">
+    <Description>
+        Event-driven systems reflect how modern businesses actually work, with thousands of small changes happening all day, every day.
+        Steeltoe&apos;s ability to handle events and enable developers to build applications around them, means your apps will stay in sync with your business.
+        Steeltoe has event-driven options like streaming all the way to cloud functions, and data flows.
+    </Description>
+    <WhatIs>
+        When combined with microservices, event streaming opens up exciting opportunities - like event-driven architectures.
+        Steeltoe simplifies the production, processing, and consumption of events, providing several useful abstractions
+    </WhatIs>
+    <WhyUse>
+        The bedrock of any event-driven system is message handling.
+        Connecting to message platforms, routing messages, transforming messages, processing messages.
+        With Steeltoe you can solve these integration challenges quickly and easily.
+    </WhyUse>
 	<FeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
+			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
 		</div>
 	</FeatureTemplate>
 	<AltFeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
+			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/></div></div>
 		</div>
 	</AltFeatureTemplate>
-	<!-- OtherArea>
-		<div class="col text-center m-5">
-			<div class="mb-5"><h2>Ready to get started?</h2></div>
-			<div class=""><Href href="/get-started" AsButton="true">TRY THESE TUTORIALS</Href></div>
-		</div>
-	</OtherArea -->
 </Template>
 
-@code{
-	private Feature[] features = new[] {
-		//new Feature() {
-		//	Title = (MarkupString)"Steeltoe Stream",
-		//	Description = (b => {
-		//		b.AddMarkupContent(1,"Steeltoe Stream improves your productivity when working with RabbitMQ, providing three key abstractions to simplify your code. “Binders” integrate with external messaging systems. “Bindings” bridge the gap between the messaging systems and your code. “Messages” provide the structure that your code uses to send and receive data.<Br /><br />Steeltoe Stream also provides support for provisioning, content conversion, error handling, configuration management, consumer groups, partitioning, monitoring, and health checks.<Br /><br />");
-		//		b.OpenComponent<Href>(2);
-		//			b.AddAttribute(3, "href","/messaging");
-		//			b.AddAttribute(4, "AsButton",true);
-		//			b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Learn more");}));
-		//		b.CloseComponent();
-		//	}),
-		//	Img = "/images/Icon_data-transfer.svg"
-		//}
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe Messaging",
-			Description = (b => {
-				b.AddMarkupContent(1,"With the Steeltoe Messaging project, you can apply core concepts to the development of RabbitMQ based messaging solutions.<br /><br />In just a few lines, implement high-level message handling abstraction and support message-driven POCOs with a \"listener container.\"<Br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","/messaging");
-					b.AddAttribute(4, "AsButton",true);
-					b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Learn more");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"With the Steeltoe Messaging project, you can apply core concepts to the development of RabbitMQ based messaging solutions.<br /><br />In just a few lines, implement high-level message handling abstraction and support message-driven POCOs with a \"listener container.\"<Br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","/messaging");
+                b.AddAttribute(4, "AsButton",true);
+                b.AddAttribute(5, "ChildContent", (RenderFragment)(child => { child.AddContent(6, "Learn more"); }));
+                b.CloseComponent();
+            },
 			Img = "/images/Icon_device-exchange.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe Stream",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe Stream improves your productivity when working with RabbitMQ, providing three key abstractions to simplify your code. “Binders” integrate with external messaging systems. “Bindings” bridge the gap between the messaging systems and your code. “Messages” provide the structure that your code uses to send and receive data.<Br /><br />Steeltoe Stream also provides support for provisioning, content conversion, error handling, configuration management, consumer groups, partitioning, monitoring, and health checks.<Br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","/docs/stream");
-					b.AddAttribute(4, "AsButton",true);
-					b.AddAttribute(5, "ChildContent", (RenderFragment)((b) => {b.AddContent(6, "Learn more");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe Stream improves your productivity when working with RabbitMQ, providing three key abstractions to simplify your code. &quot;Binders&quot; integrate with external messaging systems. &quot;Bindings&quot; bridge the gap between the messaging systems and your code. &quot;Messages&quot; provide the structure that your code uses to send and receive data.<Br /><br />Steeltoe Stream also provides support for provisioning, content conversion, error handling, configuration management, consumer groups, partitioning, monitoring, and health checks.<Br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","/docs/stream");
+                b.AddAttribute(4, "AsButton",true);
+                b.AddAttribute(5, "ChildContent", (RenderFragment)(child => { child.AddContent(6, "Learn more"); }));
+                b.CloseComponent();
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		}
-		//new Feature() {
-		//	Title = (MarkupString)"Steeltoe Stream with support for Spring Cloud Data Flow (coming soon)",
-		//	Description = (b => {
-		//		b.AddMarkupContent(1,"Spring Cloud Data Flow offers developers a range of tools and automation for working with all kinds of data sources and destinations. Soon, Steeltoe will help you  develop, deploy, manage, and scale high-throughput streaming data pipelines across multiple cloud-native platforms.<Br /><br />");
-		//	}),
-		//	Img = "/images/Icon_network.svg"
-		//}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/GenericGuidesRedirect.razor b/src/Client/Components/Pages/GenericGuidesRedirect.razor
new file mode 100644
index 0000000..7bb62c5
--- /dev/null
+++ b/src/Client/Components/Pages/GenericGuidesRedirect.razor
@@ -0,0 +1,23 @@
+@page "/app-configuration/get-started"
+@page "/cloud-management/get-started"
+@page "/cloud-management/get-started/logging"
+@page "/getstarted"
+@page "/get-started"
+@page "/observability"
+@page "/messaging/get-started"
+@page "/security-providers/get-started"
+@page "/security-providers/get-started/credhub"
+@page "/service-connectors/get-started"
+@page "/service-connectors/get-started/gemfire"
+@page "/service-discovery/get-started"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/");
+    }
+}
diff --git a/src/Client/Components/Pages/GetStarted/Index.razor b/src/Client/Components/Pages/GetStarted/Index.razor
deleted file mode 100644
index 1961493..0000000
--- a/src/Client/Components/Pages/GetStarted/Index.razor
+++ /dev/null
@@ -1,17 +0,0 @@
-@page "/getstarted"
-@page "/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-
-<h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-
-@code {
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Home.razor b/src/Client/Components/Pages/Home.razor
index 3be2fe0..fbf3600 100644
--- a/src/Client/Components/Pages/Home.razor
+++ b/src/Client/Components/Pages/Home.razor
@@ -4,7 +4,10 @@
 @inject IOptions<CalendarEventOptions> CalendarEventOptions
 @inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
 
-<CustomPageTitle Title="Home" />
+<PageTitle>Steeltoe | Home</PageTitle>
+<HeadContent>
+    <meta name="description" content="Steeltoe is an open-source project providing a library collection that helps users build production-grade cloud-native applications using externalized configuration, database connectors, service discovery, logging and distributed tracing, application management, security, and more.">
+</HeadContent>
 
 <div class="bg-midnight-blue text-white width-all">
     <div class="width-70 container">
@@ -19,17 +22,10 @@
         <div class="row no-gutters mt-5">
             <div class="col text-center">
                 <Href class="text-white border-white mr-4" href="/why-steeltoe" AsButton="true">WHY STEELTOE</Href>
-                <Href class="text-white border-white" href="@(_docsSite.GuidesHome)" AsButton="true">GET STARTED</Href>
+                <Href class="text-white border-white" href="@(DocsSiteOptions.Value.GuidesHome)" AsButton="true">GET STARTED</Href>
             </div>
         </div>
-@*         <div class="row no-gutters mt-5">
-            <div class="col">
-                <Banner Href="https://springone.io?utm_source=steeltoe-io-home" BannerTypeName="NEWS">
-                    Registration for SpringOne at VMware Explore is now open <span class="font-weight-bold">&gt;</span>
-                </Banner>
-            </div>
-        </div>
- *@    </div>
+    </div>
 </div>
 <div class="width-all blue-slant">
     <div class="width-70 container">
@@ -38,7 +34,7 @@
             <div class="row no-gutters">
                 <div class="col component">
                     <Href href="/microservices">
-                        <div class="text-center"><img class="img-fluid" src="/images/icon-microservices-dfc414fd79f67718216adaffb5d99947.svg" /></div>
+                        <div class="text-center"><img class="img-fluid" src="/images/icon-microservices-dfc414fd79f67718216adaffb5d99947.svg" alt="Steeltoe helps you build .NET microservices." /></div>
                         <div class="title"><h3>Microservices</h3></div>
                         <div class="desc">Quickly deliver production‑grade features with independently evolvable microservices.</div>
                     </Href>
@@ -46,22 +42,24 @@
 
                 <div class="col component">
                     <Href href="/cloud">
-                        <div class="text-center"><img class="img-fluid" src="/images/icon-cloud-73c3f4c15437e8493b3d3124fc667a08.svg" /></div>
+                        <div class="text-center"><img class="img-fluid" src="/images/icon-cloud-73c3f4c15437e8493b3d3124fc667a08.svg" alt="Use Steeltoe for .NET apps in the cloud." /></div>
                         <div class="title"><h3>Cloud</h3></div>
-                        <div class="desc">Your code, any cloud—we’ve got you covered. Connect and scale your services, whatever your platform.</div>
+                        <div class="desc">Your code, any cloud—we&apos;ve got you covered. Connect and scale your services, whatever your platform.</div>
                     </Href>
                 </div>
 
                 <div class="col component">
                     <Href href="/web-applications">
-                        <div class="text-center"><img class="img-fluid" src="/images/icon-webapps-16f6e97a1447fefba82fbdfc302262af.svg" /></div>
+                        <div class="text-center">
+                            <img class="img-fluid" src="/images/icon-webapps-16f6e97a1447fefba82fbdfc302262af.svg" alt="Use Steeltoe in your web apps." />
+                        </div>
                         <div class="title"><h3>Web Apps</h3></div>
                         <div class="desc">A collection of libraries used for fast, secure, and responsive web applications connected to any data store.</div>
                     </Href>
                 </div>
                 <div class="col component">
                     <Href href="/event-driven">
-                        <div class="text-center"><img class="img-fluid" src="/images/icon-streams-825456b79c33345f5bf4a6ef73dc8cbd.svg" /></div>
+                        <div class="text-center"><img class="img-fluid" src="/images/icon-streams-825456b79c33345f5bf4a6ef73dc8cbd.svg" alt="Use Steeltoe for event-driven apps." /></div>
                         <div class="title"><h3>Event Driven</h3></div>
                         <div class="desc">Integrate with your enterprise. React to business events. Act on your streaming data in realtime.</div>
                     </Href>
@@ -74,86 +72,43 @@
     <div class="width-90 container py-5">
         <div class="row no-gutters text-center mt-3">
             <div class="col stat">
-                Steeltoe has been downloaded over <span class="number">75 million</span> times on <a href="https://www.nuget.org/profiles/SteeltoeOSS">NuGet</a>!
+                Steeltoe has been downloaded over <span class="number">98 million</span> times on <a href="https://www.nuget.org/profiles/SteeltoeOSS">NuGet</a>!
             </div>
         </div>
     </div>
 </div>
 <div style="margin: 0 0 0 51%;">
-    <svg xmlns="http://www.w3.org/2000/svg"
-         width="100%" height="100%" preserveAspectRatio="xMidYMid meet"
-         viewBox="0 0 3517 363">
-        <path fill="#7f9bb6" d="M 0.00,362.00
-           C 0.00,362.00 28.00,363.00 28.00,363.00
-             28.00,363.00 89.00,363.00 89.00,363.00
-             89.00,363.00 301.00,363.00 301.00,363.00
-             301.00,363.00 1026.00,363.00 1026.00,363.00
-             1026.00,363.00 3517.00,363.00 3517.00,363.00
-             3517.00,363.00 3517.00,0.00 3517.00,0.00
-             3517.00,0.00 3495.00,0.00 3495.00,0.00
-             3495.00,0.00 3465.00,2.83 3465.00,2.83
-             3465.00,2.83 3388.00,10.83 3388.00,10.83
-             3388.00,10.83 3205.00,29.83 3205.00,29.83
-             3205.00,29.83 2718.00,80.17 2718.00,80.17
-             2718.00,80.17 2608.00,91.83 2608.00,91.83
-             2608.00,91.83 2319.00,121.83 2319.00,121.83
-             2319.00,121.83 1562.00,200.17 1562.00,200.17
-             1562.00,200.17 1196.00,238.17 1196.00,238.17
-             1196.00,238.17 753.00,284.17 753.00,284.17
-             753.00,284.17 252.00,336.17 252.00,336.17
-             252.00,336.17 79.00,354.17 79.00,354.17
-             79.00,354.17 0.00,362.00 0.00,362.00 Z" />
+    <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" preserveAspectRatio="xMidYMid meet"viewBox="0 0 3517 363">
+        <path fill="#7f9bb6" d="M 0.00,362.00C 0.00,362.00 28.00,363.00 28.00,363.0028.00,363.00 89.00,363.00 89.00,363.0089.00,363.00 301.00,363.00 301.00,363.00301.00,363.00 1026.00,363.00 1026.00,363.001026.00,363.00 3517.00,363.00 3517.00,363.003517.00,363.00 3517.00,0.00 3517.00,0.003517.00,0.00 3495.00,0.00 3495.00,0.003495.00,0.00 3465.00,2.83 3465.00,2.833465.00,2.83 3388.00,10.83 3388.00,10.833388.00,10.83 3205.00,29.83 3205.00,29.833205.00,29.83 2718.00,80.17 2718.00,80.172718.00,80.17 2608.00,91.83 2608.00,91.832608.00,91.83 2319.00,121.83 2319.00,121.832319.00,121.83 1562.00,200.17 1562.00,200.171562.00,200.17 1196.00,238.17 1196.00,238.171196.00,238.17 753.00,284.17 753.00,284.17753.00,284.17 252.00,336.17 252.00,336.17252.00,336.17 79.00,354.17 79.00,354.1779.00,354.17 0.00,362.00 0.00,362.00 Z" />
     </svg>
 </div>
 <div class="left-yellow-slant bg-midnight-blue text-white width-all pb-4">
     <div class="width-70 container">
         <div class="text-center width-all pb-3"><h2>News</h2></div>
-        @if (_events == null)
-        {
-            <span>&nbsp;</span>
-        }
-        else
-        {
-            int i = 1;
-            @foreach (var calendarEvent in _events)
-            {
-                <div class="row no-gutters">
-                    <div class="col news">
-                        <div class="date">@((MarkupString)calendarEvent.Date)</div>
-                        <div class="title">@((MarkupString)calendarEvent.Title)</div>
-                        <div class="desc">@((MarkupString)calendarEvent.Description)</div>
-                        <div class=""><a class="special-link" href="@calendarEvent.URL" target="_blank">read more &gt;</a></div>
-                    </div>
+@if (CalendarEventOptions?.Value.Events == null)
+{
+        <span>&nbsp;</span>
+}
+else
+{
+    var i = 1;
+    @foreach (var calendarEvent in CalendarEventOptions?.Value.Events ?? [])
+    {
+            <div class="row no-gutters">
+                <div class="col news">
+                    <div class="date">@((MarkupString)calendarEvent.Date)</div>
+                    <div class="title">@((MarkupString)calendarEvent.Title)</div>
+                    <div class="desc">@((MarkupString)calendarEvent.Description)</div>
+                    <div class=""><a class="special-link" href="@calendarEvent.URL" target="_blank">read more &gt;</a></div>
                 </div>
-                @if (i++ < _events.Count())
-                {
-                    <div class="row no-gutters">
-                        <div class="col"><hr class="border-steeltoe-blue" /></div>
-                    </div>
-                }
-            }
+            </div>
+        @if (i++ < CalendarEventOptions?.Value.Events.Count)
+        {
+            <div class="row no-gutters">
+                <div class="col"><hr class="border-steeltoe-blue" /></div>
+            </div>
         }
-    </div>
-</div>
-
-@*<div class="bg-grey width-all grey">
-     <div class="width-60 container py-5">
-        <div class="text-center width-all black"><h3>Testimonials</h3></div>
-        <div class="row no-gutters mt-3">
-         <div class="col testimonial">
-            <div class="desc">"I can't believe how much time Steeltoe is saving me! We went from concept to production in 2 weeks!"</div>
-            <div class="name">-Some one</div>
-         </div>
-        </div>
-     </div>
-    </div>*@
-@code {
-    private DocsSiteOptions _docsSite;
-    private List<CalendarEvent> _events;
-
-    protected override void OnInitialized()
-    {
-        _docsSite = DocsSiteOptions?.Value ?? throw new ArgumentNullException(nameof(_docsSite));
-        _events = CalendarEventOptions?.Value.Events ?? new();
     }
 }
+    </div>
+</div>
diff --git a/src/Client/Components/Pages/Initializr/Index.razor b/src/Client/Components/Pages/Initializr/Index.razor
index c141eca..514153a 100644
--- a/src/Client/Components/Pages/Initializr/Index.razor
+++ b/src/Client/Components/Pages/Initializr/Index.razor
@@ -1,21 +1,22 @@
 @page "/initializr"
 
-<Template Name="Steeltoe Initializr" GettingStartedURL="https://start.steeltoe.io" ShowBottomGetStarted="false">
+<Template Name="Steeltoe Initializr" GettingStartedUrl="https://start.steeltoe.io" ShowBottomGetStarted="false" MetaDescription="Steeltoe Initializr generates .NET projects with just what you need to start quickly!">
 	<Description>
-	<div class="row no-gutters mb-4">
-		<div class="col-8 offset-2" style="font-size: 71%;">
-			<Banner Href="https://github.com/SteeltoeOSS/steeltoe/blob/master/roadmaps/3.0.0.md" BannerTypeName="beta">
-				<span class="font-weight-bold">Initializr is in beta development.</span> Version 1 is coming very soon! &gt; &nbsp;&nbsp;
-			</Banner>
-		</div>
-	</div>
-	One of the biggest secrets to highly productive .NET development teams is application generators. Enterprises have found that developers adopt platforms far quicker when everything they need to get started is right there, at their fingertips. Application generators help developers to get started quickly by providing useful guide rails that reduce toil and ease their burden. Application generators also encourage common approaches to common problems, which is particularly useful if you have lots of teams creating microservices at the same time.
+        One of the biggest secrets to highly productive .NET development teams is application generators.
+        Enterprises have found that developers adopt platforms far quicker when everything they need to get started is right there, at their fingertips.
+        Application generators help developers to get started quickly by providing useful guide rails that reduce toil and ease their burden.
+        Application generators also encourage common approaches to common problems, which is particularly useful if you have lots of teams creating microservices at the same time.
 	</Description>
 	<WhyUse>
-		An application generator can help bond development teams and security teams to the same vision by making the right thing, the easy thing. Instead of developers using previous projects to start a new project they use the application generator. Now they can start with an up to date version of all required dependencies!
+        An application generator can help bond development teams and security teams to the same vision by making the right thing, the easy thing.
+        Instead of developers using previous projects to start a new project they use the application generator. Now they can start with an up-to-date version of all required dependencies!
 	</WhyUse>
 	<WhatIs>
-		The Steeltoe Initializr project is an application generator meant to get cloud-native .NET developers going very quickly. But it doesn’t stop there. Chances are your apps aren’t just using the typical .NET Core or Steeltoe libraries. It’s also using internal custom libraries specific to your business. Every business has libraries: tools they rely on to simplify tasks or take care of the plumbing. These libraries are quite important and often include proprietary business logic that’s both private and unique. Application generators can help developers to get easy access to these libraries without having to delve into docs, wade through wikis, or search in NuGet repositories.
+        The Steeltoe Initializr project is an application generator meant to get cloud-native .NET developers going very quickly.
+        But it doesn't stop there. Chances are your apps aren&apos;t just using the typical .NET Core or Steeltoe libraries.
+        It&apos;s also using internal custom libraries specific to your business. Every business has libraries: tools they rely on to simplify tasks or take care of the plumbing.
+        These libraries are quite important and often include proprietary business logic that&apos;s both private and unique.
+        Application generators can help developers to get easy access to these libraries without having to delve into docs, wade through wikis, or search in NuGet repositories.
 	</WhatIs>
 	<OtherArea>
 		<div class="row no-gutters">
@@ -25,21 +26,27 @@
 		</div>
 		<div class="row mb-5 no-gutters">
 			<div class="col component-whyuse-desc">
-				There are a few ways you can use Steeltoe Initializr. Every option gives you the same ready to go Visual Studio project. The typical use of Initializr is hosting the service in-house. Because it is a nuget distributed package included in an even simple'r .NET Core app, hosting and staying up to date doesn't come with a bunch of debt. Hosting in-house also gives teams the option to add their own private dependencies to the service, but stay up to date with the community.
+                There are a few ways you can use Steeltoe Initializr. Every option gives you the same ready-to-go .NET project. The typical use of Initializr is hosting the service in-house.
+                Because it is a nuget-distributed package included in an even simpler .NET app, hosting and staying up to date doesn't come with a bunch of debt.
+                Hosting in-house also gives teams the option to add their own private dependencies to the service, but stay up to date with the community.
 			</div>
 		</div>
 		<div class="row mb-5 no-gutters">
 			<div class="col component-whyuse-desc">
 				<h4>Hosted Service</h4>
 				<div>
-					As a hosted service, Initializr offers both API and browser interfaces. The service itself is distributed as a Nuget package which you include in a new .NET Core web project. From there you can run the project as a web-based service. Out of the box you'll get all the <Href href="https://github.com/SteeltoeOSS/initializr" NewWindow="true">default dependencies</Href> along with endpoints for interaction. Try the below curl command that uses our hosted Initializr service to get started.<br /><br />
-<pre><code class="bash">curl https://start.steeltoe.io/starter.zip -d "dependencies=Actuators,DynamicLogger,SQL Server" -d "projectName=MyCompany.MySample" -o "myProject.zip"</code></pre>
+                    As a hosted service, Initializr offers both API and browser interfaces. The service itself is distributed as a Nuget package which you include in a new .NET Core web project.
+                    From there, you can run the project as a web-based service. Out of the box you'll get all the <Href href="https://github.com/SteeltoeOSS/initializr" NewWindow="true">default dependencies</Href> along with endpoints for interaction.
+                    Try the below curl command that uses our hosted Initializr service to get started.<br /><br />
+                    <pre><code style="color:white">curl https://start.steeltoe.io/starter.zip -d "dependencies=Actuators,DynamicLogger,SQL Server" -d "projectName=MyCompany.MySample" -o "myProject.zip"</code></pre>
 				</div>
 			</div>
 			<div class="col component-whyuse-desc">
 				<h4>Browser UI</h4>
 				<div>
-					Along with adding the Initializr package, you can optionally add a UI in the same .NET Core project. This gives developers an additional interaction with the Initializr service. We have created a <Href href="https://github.com/SteeltoeOSS/initializr" NewWindow="true">basic web project</Href> doing just that to help get started. If you'de like to see the UI in action head over to <Href href="https://start.steeltoe.io" NewWindow="true">https://start.steeltoe.io</Href> and create your first Initializr project now!
+                    Along with adding the Initializr package, you can optionally add a UI in the same .NET project. This gives developers an additional interaction with the Initializr service.
+                    We have created a <Href href="https://github.com/SteeltoeOSS/initializr" NewWindow="true">basic web project</Href> doing just that to help get started.
+                    If you'd like to see the UI in action, head over to <Href href="https://start.steeltoe.io" NewWindow="true">https://start.steeltoe.io</Href> and create your first Initializr project now!
 				</div>
 			</div>
 		</div>
@@ -50,11 +57,15 @@
 		</div>
 		<div class="row mb-5 no-gutters">
 			<div class="col component-whyuse-desc">
-				No matter the way you choose to use Initializr, the value is in the distribution of pre-packaged dependencies. The <Href href="xxxx" target="_blank">default dependencies</Href> included in Initializr are mostly Steeltoe focused. Things like database connectors, a Spring config client, a Consul discovery client, and many others. But this is a community driven project, so it only makes sense to offer ways for the .NET community to contribute.<br /><br />
+                No matter the way you choose to use Initializr, the value is in the distribution of pre-packaged dependencies. The <Href href="xxxx" target="_blank">default dependencies</Href> included in Initializr are mostly Steeltoe focused.
+                Things like database connectors, a Spring Cloud Config Server client, a Consul service discovery client, and many others. But this is a community driven project, so it only makes sense to offer ways for the .NET community to contribute.<br /><br />
 				<h4>Creating private dependencies</h4>
-				Running Initializr in-house isn’t just about limited network connections. The Steeltoe Initializr is meant to be extended. While having the ability to generate Steeltoe projects automatically is super awesome, what if you could also add in your own dependencies? What if your organization could offer a starting place for all developers, that (safely) includes your best practices and secret sauce?<br /><br />
+                Running Initializr in-house isn&apos;t just about limited network connections. The Steeltoe Initializr is meant to be extended.
+                While having the ability to generate Steeltoe projects automatically is super awesome, what if you could also add in your own dependencies?
+                What if your organization could offer a starting place for all developers, that (safely) includes your best practices and secret sauce?<br /><br />
 				<h4>Creating for public use on start.steeltoe.io</h4>
-				If you would like for your Initializr dependency to be a part of the publicly hosted service, please review the <Href href="https://github.com/SteeltoeOSS/initializr/blob/master/THIRD-PARTY-CONTRIBUTIONS.md" NewWindow="true">guidelines</Href>. Once you have everything in place, <Href href="https://github.com/SteeltoeOSS/initializr/issues" NewWindow="true">open an enhancement issue in GitHub</Href>.<br /><br />
+                If you would like for your Initializr dependency to be a part of the publicly hosted service, please review the <Href href="https://github.com/SteeltoeOSS/initializr/blob/master/THIRD-PARTY-CONTRIBUTIONS.md" NewWindow="true">guidelines</Href>.
+                Once you have everything in place, <Href href="https://github.com/SteeltoeOSS/initializr/issues" NewWindow="true">open an enhancement issue in GitHub</Href>.<br /><br />
 			</div>
 		</div>
 		<div class="col text-center m-5">
@@ -63,5 +74,3 @@
 		</div>
 	</OtherArea>
 </Template>
-@code{
-}
diff --git a/src/Client/Components/Pages/Management/Endpoints.razor b/src/Client/Components/Pages/Management/Endpoints.razor
deleted file mode 100644
index ce72464..0000000
--- a/src/Client/Components/Pages/Management/Endpoints.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/cloud-management/get-started/endpoints"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Management Endpoints"
-						 ParentLinkName="Cloud Management"
-						 ParentLinkUrl="/cloud-management"
-						 ShowGetStarted="true" />
-
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/cloud-management/endpoints-netcore.html")">management endpoint guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/cloud-management/endpoints-netcore.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Management/Endpoints_Framework.razor b/src/Client/Components/Pages/Management/Endpoints_Framework.razor
deleted file mode 100644
index dcb570e..0000000
--- a/src/Client/Components/Pages/Management/Endpoints_Framework.razor
+++ /dev/null
@@ -1,25 +0,0 @@
-@page "/cloud-management/get-started/endpoints/framework"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Management Endpoints (.NET Framework)"
-						 ParentLinkName="Cloud Management"
-						 ParentLinkUrl="/cloud-management"
-						 ShowGetStarted="true" />
-
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/cloud-management/endpoints-framework.html")">.NET Framework management endpoints guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/cloud-management/endpoints-framework.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
-}
diff --git a/src/Client/Components/Pages/Management/GettingStarted.razor b/src/Client/Components/Pages/Management/GettingStarted.razor
deleted file mode 100644
index fd2cc56..0000000
--- a/src/Client/Components/Pages/Management/GettingStarted.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/cloud-management/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-						ParentLinkName="Cloud Management"
-						ParentLinkUrl="/cloud-management" />
-<GetStarted>
-    <ComponentName>Cloud Management</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Management/Index.razor b/src/Client/Components/Pages/Management/Index.razor
index b0cae33..2b642ce 100644
--- a/src/Client/Components/Pages/Management/Index.razor
+++ b/src/Client/Components/Pages/Management/Index.razor
@@ -2,46 +2,53 @@
 @page "/steeltoe-management"
 @page "/management"
 
-<Template Name="Management" Features="@features" DocsURL="/docs/management">
-	<Description>Steeltoe includes a number of optional features you can add to your applications to aid in monitoring and managing it while it runs in production. These features are implemented as a number of management endpoints that you can easily add to your application.</Description>
-	<WhatIs>Once your application is in production, management tools become a must. Unlike traditional infrastructure, cloud platforms offer limited access to VMs and disk storage. Management automatically creates secure endpoints exposing critical data about your application. </WhatIs>
-	<WhyUse>The way the endpoints are exposed and used depends on the type of technology you choose in exposing the functionality of the endpoint. Out of the box, Steeltoe provides several easy ways to expose these endpoints over HTTP in .NET applications. Of course, you can build and use whatever you would like to meet your needs.</WhyUse>
+<Template Name="Management" Features="@_features" DocsUrl="/docs/management" MetaDescription="Steeltoe provides production-ready actuators and a Task framework to help manage your .NET applications.">
+    <Description>
+        Steeltoe includes a number of optional features you can add to your applications to aid in monitoring and managing it while it runs in production.
+        These features are implemented as a number of management endpoints that you can easily add to your application.
+    </Description>
+    <WhatIs>
+        Once your application is in production, management tools become a must. Unlike traditional infrastructure, cloud platforms offer limited access to VMs and disk storage.
+        Management automatically creates secure endpoints exposing critical data about your application.
+    </WhatIs>
+    <WhyUse>
+        The way the endpoints are exposed and used depends on the type of technology you choose in exposing the functionality of the endpoint.
+        Out of the box, Steeltoe provides several easy ways to expose these endpoints over HTTP in .NET applications.
+        Of course, you can build and use whatever you would like to meet your needs.
+    </WhyUse>
 	<FeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
+			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
 		</div>
 	</FeatureTemplate>
 	<AltFeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
+			<div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
 		</div>
 	</AltFeatureTemplate>
 </Template>
 
-
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Management Endpoints",
-			Description = (b => {
-				b.AddMarkupContent(1,"Automatically expose endpoints over HTTP in your ASP.NET application for things like health, info, metrics, refresh, tracing, loggers, and route mappings.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Automatically expose endpoints over HTTP in your ASP.NET application for things like health, info, metrics, refresh, tracing, loggers, and route mappings.");
+            },
 			Img = "/images/Icon_connector.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Management Tasks",
-			Description = (b => {
-				b.AddMarkupContent(1,"Run one-time administrative tasks for ASP.NET Core applications, for things like data migrations or custom processes.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Run one-time administrative tasks for ASP.NET Core applications, for things like data migrations or custom processes.");
+            },
 			Img = "/images/Icon_box.svg"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/Management/Logging.razor b/src/Client/Components/Pages/Management/Logging.razor
deleted file mode 100644
index 06d8259..0000000
--- a/src/Client/Components/Pages/Management/Logging.razor
+++ /dev/null
@@ -1,21 +0,0 @@
-@page "/cloud-management/get-started/logging"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Dynamic Logging"
-						 ParentLinkName="Cloud Management"
-						 ParentLinkUrl="/cloud-management"
-						 ShowGetStarted="true" />
-<Tutorial>
-	<Title>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Management/Redirects.razor b/src/Client/Components/Pages/Management/Redirects.razor
new file mode 100644
index 0000000..54145aa
--- /dev/null
+++ b/src/Client/Components/Pages/Management/Redirects.razor
@@ -0,0 +1,25 @@
+@page "/cloud-management/get-started/{Provider}"
+@page "/cloud-management/get-started/endpoints/{Provider}"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    [Parameter] public string Provider { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/cloud-management/{TranslateProviderName(Provider)}.html");
+    }
+
+    private static string TranslateProviderName(string provider)
+    {
+        return provider.ToLower() switch
+        {
+            "endpoints" => "endpoints-netcore",
+            "framework" => "endpoints-framework",
+            _ => provider
+        };
+    }
+}
diff --git a/src/Client/Components/Pages/Management/Tracing.razor b/src/Client/Components/Pages/Management/Tracing.razor
deleted file mode 100644
index a516795..0000000
--- a/src/Client/Components/Pages/Management/Tracing.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/cloud-management/get-started/distributed-tracing"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Distributed Tracing"
-						 ParentLinkName="Cloud Management"
-						 ParentLinkUrl="/cloud-management"
-						 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/cloud-management/distributed-tracing.html")">distributed tracing guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/cloud-management/distributed-tracing.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Messaging/GettingStarted.razor b/src/Client/Components/Pages/Messaging/GettingStarted.razor
deleted file mode 100644
index b7dc8a1..0000000
--- a/src/Client/Components/Pages/Messaging/GettingStarted.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/messaging/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-						 ParentLinkName="Messaging"
-						 ParentLinkUrl="/messaging" />
-<GetStarted>
-	<ComponentName>Messaging</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Messaging/Index.razor b/src/Client/Components/Pages/Messaging/Index.razor
index f8e87ac..dcd2a88 100644
--- a/src/Client/Components/Pages/Messaging/Index.razor
+++ b/src/Client/Components/Pages/Messaging/Index.razor
@@ -1,50 +1,49 @@
 @page "/messaging"
 
-<Template Name="Messaging" Features="@features" DocsURL="/docs/messaging">
+<Banner BannerTypeName="Deprecation Notice" Href="https://github.com/SteeltoeOSS/Steeltoe/issues/1244">
+    This component has been discontinued from Steeltoe v4. Please click here to read more and provide feedback.
+</Banner>
+
+<Template Name="Messaging" Features="@_features" DocsUrl="/docs/messaging" MetaDescription="Use Steeltoe Messaging to build event-driven applications.">
 	<Description>Build highly scalable event-driven microservices connected to shared messaging systems.</Description>
-	<WhatIs>The Steeltoe Messaging project applies core .NET concepts to the development of AMQP-based messaging solutions. It provides a "template" as a high-level abstraction for sending and receiving messages. It also provides support for Message-driven POCOs with a "listener container". These libraries facilitate management of AMQP resources while promoting the use of dependency injection and declarative configuration.</WhatIs>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+    <WhatIs>
+        The Steeltoe Messaging project applies core .NET concepts to the development of AMQP-based messaging solutions.
+        It provides a "template" as a high-level abstraction for sending and receiving messages. It also provides support for Message-driven POCOs with a "listener container".
+        These libraries facilitate management of AMQP resources while promoting the use of dependency injection and declarative configuration.
+    </WhatIs>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] {
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"RabbitMQ Message Broker",
-			Description = (b => {
-				b.AddMarkupContent(1,"Using the native RabbitMQ .NET client within, the Steeltoe Messaging client abstracts the complexity of messaging containers and translates them into simple configuration values.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Using the native RabbitMQ .NET client within, the Steeltoe Messaging client abstracts the complexity of messaging containers and translates them into simple configuration values.");
+            },
 			Img = "/images/rabbitmq.png"
 		},
-		//new Feature() {
-		//	Title = (MarkupString)"Logging & Health Checks Built In",
-		//	Description = (b => {
-		//		b.AddMarkupContent(1,"With the addition of Steeltoe Logging and the health management endpoint, the application will receive and stream logs from the message broker as well include the message broker as an IHealthcontributor.");
-		//	}),
-		//	Img = "/images/Icon_cloud.svg"
-		//},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Rabbit Admin",
-			Description = (b => {
-				b.AddMarkupContent(1,"Simple implementation of RabbitAdmin to automatically delare queues, exchanges, and bindings.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Simple implementation of RabbitAdmin to automatically declare queues, exchanges, and bindings.");
+            },
 			Img = "/images/Icon_keys.svg"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/Messaging/Rabbit.razor b/src/Client/Components/Pages/Messaging/Rabbit.razor
deleted file mode 100644
index 2c1239e..0000000
--- a/src/Client/Components/Pages/Messaging/Rabbit.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/messaging/get-started/rabbitmq"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Messaging with RabbitMQ "
-							 ParentLinkName="Messaging"
-							 ParentLinkUrl="/messaging"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/messaging/rabbitmq.html")">messaging with RabbitMQ guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/messaging/rabbitmq.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Messaging/Redirects.razor b/src/Client/Components/Pages/Messaging/Redirects.razor
new file mode 100644
index 0000000..9dd39c8
--- /dev/null
+++ b/src/Client/Components/Pages/Messaging/Redirects.razor
@@ -0,0 +1,12 @@
+@page "/messaging/get-started/rabbitmq"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/messaging/rabbitmq.html");
+    }
+}
diff --git a/src/Client/Components/Pages/Microservices.razor b/src/Client/Components/Pages/Microservices.razor
index ba76fe6..9a62bef 100644
--- a/src/Client/Components/Pages/Microservices.razor
+++ b/src/Client/Components/Pages/Microservices.razor
@@ -1,95 +1,70 @@
-@page "/microservices"
+@page "/microservices"
 @page "/microservice"
 
-<Template Name="Microservices" NameIsPlural="true" ShowBottomGetStarted="false" Features="@features">
-	<Description>Microservice architectures are the ‘new normal’. Building small, self-contained, ready to run applications can bring great flexibility and added resilience to your code. Steeltoe’s many purpose-built features make it easy to build and run your microservices in production at scale. And don’t forget, no microservice architecture is complete without <Href href="/cloud">cloud components</Href> ‒ easing administration and boosting your fault-tolerance.</Description>
+<Template Name="Microservices" NameIsPlural="true" ShowBottomGetStarted="false" Features="@_features" MetaDescription="Explore how Steeltoe can help with your .NET microservices.">
+    <Description>
+        Microservice architectures are the &apos;new normal&apos;. Building small, self-contained, ready to run applications can bring great flexibility and added resilience to your code.
+        Steeltoe&apos;s many purpose-built features make it easy to build and run your microservices in production at scale.
+        And don&apos;t forget, no microservice architecture is complete without <Href href="/cloud">cloud components</Href> ‒ easing administration and boosting your fault-tolerance.
+    </Description>
 	<WhatIs>Microservices are a modern approach to software whereby application code is delivered in small, manageable pieces, independent of others.</WhatIs>
 	<WhyUse>Their small scale and relative isolation can lead to many additional benefits, such as easier maintenance, improved productivity, greater fault tolerance, better business alignment, and more.</WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
-	<!-- OtherArea>
-		<div class="col text-center m-5">
-			<div class="mb-5"><h2>Ready to get started?</h2></div>
-			<div class=""><Href href="/get-started" AsButton="true">TRY THESE TUTORIALS</Href></div>
-		</div>
-	</OtherArea -->
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] {
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Microservices with Steeltoe",
-			Description = (b => {
-				b.AddMarkupContent(1,"With Steeltoe, your microservices can start small and iterate fast. That’s why it's quickly becoming the standard for .NET microservices. Quickstart your project with ");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","/initializr");
-					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "Steeltoe Initializr");}));
-				b.CloseComponent();
-				b.AddMarkupContent(6," and then package as a container. With Steeltoe’s middleware pipeline model, you’re ready to go in minutes.<br /><br />");
-//				b.OpenComponent<Href>(7);
-//					b.AddAttribute(8, "href","/get-started");
-//					b.AddAttribute(9, "AsButton",true);
-//					b.AddAttribute(10, "ChildContent", (RenderFragment)((b) => {b.AddContent(11, "TRY OUR QUICKSTART GUIDE");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"With Steeltoe, your microservices can start small and iterate fast. Quickstart your project with ");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","/initializr");
+                b.AddAttribute(4, "ChildContent", (RenderFragment)(child => { child.AddContent(5, "Steeltoe Initializr"); }));
+                b.CloseComponent();
+                b.AddMarkupContent(6," and then package as a container. With Steeltoe&apos;s help, you&apos;re ready to go in minutes.<br /><br />");
+            },
 			Img = "/images/Icon_down-arrow.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Microservice resilience with Steeltoe Cloud Components",
-			Description = (b => {
-				b.AddMarkupContent(1,"The distributed nature of microservices brings challenges. Steeltoe helps you mitigate these. With several ready-to-run cloud patterns, Steeltoe's ");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","/cloud");
-					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "cloud components");}));
-				b.CloseComponent();
-				b.AddMarkupContent(6," can help with service discovery, load-balancing, circuit-breaking, distributed tracing, monitoring, and more.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"The distributed nature of microservices brings challenges. Steeltoe helps you mitigate these. With several ready-to-run cloud patterns, Steeltoe's ");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","/cloud");
+                b.AddAttribute(4, "ChildContent", (RenderFragment)(child => { child.AddContent(5, "cloud components"); }));
+                b.CloseComponent();
+                b.AddMarkupContent(6," can help with service discovery, load-balancing, monitoring, and more.");
+            },
 			Img = "/images/Icon_tool.svg"
 		},
-		//new Feature() {
-		//	Title = (MarkupString)"Build streaming data microservices with Steeltoe Streams",
-		//	Description = (b => {
-		//		b.AddMarkupContent(1,"Steeltoe Streams makes it easy to consume and produce events, no matter which messaging platform you choose. Steeltoe Stream connects your microservices with real-time messaging in just a few lines of code, to help you build highly scalable, event-driven systems.<br /><br />");
-		//		b.OpenComponent<Href>(2);
-		//			b.AddAttribute(3, "href","/streams/get-started");
-		//			b.AddAttribute(9, "AsButton",true);
-		//			b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "Get started with Steeltoe Streams");}));
-		//		b.CloseComponent();
-		//	}),
-		//	Img = "/images/Icon_data-transfer.svg"
-		//},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Microservices on Cloud Foundry",
-			Description = (b => {
-				b.AddMarkupContent(1,"The small, stateless nature of microservices makes them ideal for horizontal scaling. Platforms like Tanzu Application Service and Kubernetes can provide scalable infrastructure to match, with and greatly reduce your administrative overhead. Using ");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","service-connectors");
-					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "service connectors");}));
-				b.CloseComponent();
-				b.AddMarkupContent(6,", you can also consume multiple backend services with ease.<br /><br />");
-//				b.OpenComponent<Href>(7);
-//					b.AddAttribute(8, "href","https://run.pivotal.io");
-//					b.AddAttribute(9, "NewWindow",true);
-//					b.AddAttribute(10, "ChildContent", (RenderFragment)((b) => {b.AddContent(11, "Try Pivotal Web Services for free");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"The small, stateless nature of microservices makes them ideal for horizontal scaling. Platforms like VMware Tanzu Platform can provide scalable infrastructure to match, with and greatly reduce your administrative overhead. Using ");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","service-connectors");
+                b.AddAttribute(4, "ChildContent", (RenderFragment)(child => { child.AddContent(5, "service connectors"); }));
+                b.CloseComponent();
+                b.AddMarkupContent(6,", you can also consume multiple backend services with ease.<br /><br />");
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/NetworkFileSharing/Index.razor b/src/Client/Components/Pages/NetworkFileSharing/Index.razor
deleted file mode 100644
index fd9a927..0000000
--- a/src/Client/Components/Pages/NetworkFileSharing/Index.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/fileshares"
-@page "/network-file-sharing"
-@page "/steeltoe-smb"
-
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<GetStarted>
-    <ComponentName>Network File Sharing</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.FileShareHome)">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.FileShareHome).ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/NetworkFileSharing/Redirects.razor b/src/Client/Components/Pages/NetworkFileSharing/Redirects.razor
new file mode 100644
index 0000000..89bae6a
--- /dev/null
+++ b/src/Client/Components/Pages/NetworkFileSharing/Redirects.razor
@@ -0,0 +1,13 @@
+@page "/fileshares"
+@page "/network-file-sharing"
+@page "/steeltoe-smb"
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo(DocsSiteOptions.Value.FileShareHome);
+    }
+}
diff --git a/src/Client/Components/Pages/Observability/AppManager.razor b/src/Client/Components/Pages/Observability/AppManager.razor
deleted file mode 100644
index e88dee6..0000000
--- a/src/Client/Components/Pages/Observability/AppManager.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/observability/tanzu"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Tanzu App Manager"
-							 ParentLinkName="Observability"
-							 ParentLinkUrl="/observability"
-							 ShowGetStarted="false" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/observability/tanzu.html")">VMware Tanzu Apps Manager guide</NavLink>
-    </Title>
-</Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/observability/tanzu.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Observability/Grafana.razor b/src/Client/Components/Pages/Observability/Grafana.razor
deleted file mode 100644
index 151f497..0000000
--- a/src/Client/Components/Pages/Observability/Grafana.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/observability/grafana"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Grafana"
-							 ParentLinkName="Observability"
-							 ParentLinkUrl="/observability"
-							 ShowGetStarted="false" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/observability/grafana.html")">Grafana guide</NavLink>
-    </Title>
-</Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/observability/grafana.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Observability/Index.razor b/src/Client/Components/Pages/Observability/Index.razor
deleted file mode 100644
index c21810e..0000000
--- a/src/Client/Components/Pages/Observability/Index.razor
+++ /dev/null
@@ -1,22 +0,0 @@
-@page "/observability"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Observability"/>
-<GetStarted>
-    <ComponentName>Observability</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Observability/Redirects.razor b/src/Client/Components/Pages/Observability/Redirects.razor
new file mode 100644
index 0000000..ab1840a
--- /dev/null
+++ b/src/Client/Components/Pages/Observability/Redirects.razor
@@ -0,0 +1,14 @@
+@page "/observability/{Provider}"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    [Parameter] public string Provider { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/observability/{Provider}.html");
+    }
+}
diff --git a/src/Client/Components/Pages/Observability/WaveFront.razor b/src/Client/Components/Pages/Observability/WaveFront.razor
deleted file mode 100644
index 8cce9bb..0000000
--- a/src/Client/Components/Pages/Observability/WaveFront.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/observability/wavefront"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Wavefront"
-							 ParentLinkName="Observability"
-							 ParentLinkUrl="/observability"
-							 ShowGetStarted="false" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/observability/wavefront.html")">Wavefront guide</NavLink>
-    </Title>
-</Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/observability/wavefront.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/Credhub.razor b/src/Client/Components/Pages/Security/Credhub.razor
deleted file mode 100644
index 9cac59b..0000000
--- a/src/Client/Components/Pages/Security/Credhub.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/security-providers/get-started/credhub"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="CredHub Client"
-						 ParentLinkName="Security Providers"
-						 ParentLinkUrl="/security-providers"
-						 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">guides</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/GettingStarted.razor b/src/Client/Components/Pages/Security/GettingStarted.razor
deleted file mode 100644
index c138e9e..0000000
--- a/src/Client/Components/Pages/Security/GettingStarted.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/security-providers/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-							 ParentLinkName="Security"
-							 ParentLinkUrl="/security-providers" />
-<GetStarted>
-    <ComponentName>Security Providers</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/Index.razor b/src/Client/Components/Pages/Security/Index.razor
index efa83ba..ca5dcd9 100644
--- a/src/Client/Components/Pages/Security/Index.razor
+++ b/src/Client/Components/Pages/Security/Index.razor
@@ -1,60 +1,67 @@
-@page "/security-providers"
+@page "/security-providers"
 @page "/steeltoe-security"
 @page "/security"
 
-<Template Name="Security" Features="@features" DocsURL="/docs/security">
-	<Description>Securing your applications and microservices using the security services provided by cloud platforms can seem like an impossible and complex development effort. Steeltoe reduces that effort by including security providers which enable you to easily integrate ASP.NET Core authentication and authorization features with Cloud Foundry security services.</Description>
-	<WhatIs>Applications must have some notion of security, but you don’t want to lock the app in to a certain provider. Instead use the native functions of .NET and let the platform decide the provider. Cloud Security helps your app achieve that abstraction.</WhatIs>
-	<WhyUse>Steeltoe provides a number of Security related services that simplify using a cloud platform’s security services in ASP.NET applications.</WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+<Template Name="Security" Features="@_features" DocsUrl="/docs/security" MetaDescription="Use Steeltoe to facilitate authentication and authorization with Cloud Foundry security services.">
+    <Description>
+        Securing your applications and microservices using the security services provided by cloud platforms can seem like an impossible and complex development effort.
+        Steeltoe reduces that effort by including security providers which enable you to easily integrate ASP.NET Core authentication and authorization features with Cloud Foundry security services.
+    </Description>
+    <WhatIs>
+        Applications must have some notion of security, but you don&apos;t want to lock the app in to a certain provider.
+        Instead, use the native functions of .NET and let the platform decide the provider.
+        Cloud Security helps your app achieve that abstraction.
+    </WhatIs>
+	<WhyUse>Steeltoe provides a number of Security-related services that simplify using a cloud platform&apos;s security services in ASP.NET applications.</WhyUse>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
-			Title = (MarkupString)"Single Sign-on with OAuth2 or OpenID Connect",
-			Description = (b => {
-				b.AddMarkupContent(1,"Leverage existing credentials managed by an OAuth2 service for authentication and authorization in ASP.NET Core applications or with OpenID Connect in ASP.NET Framework (4.x).");
-			}),
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
+			Title = (MarkupString)"Single Sign-on with OpenID Connect",
+			Description = b => {
+                b.AddMarkupContent(1,"Leverage existing credentials managed by an OAuth2 service for authentication and authorization in ASP.NET Core applications or with OpenID Connect in ASP.NET Framework (4.x).");
+            },
 			Img = "/images/Icon_computer.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Resource Protection using JWT",
-			Description = (b => {
-				b.AddMarkupContent(1,"Control access to REST resources by using JWT tokens.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Control access to REST resources by using JWT tokens.");
+            },
 			Img = "/images/Icon_security.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Redis Key Storage Provider",
-			Description = (b => {
-				b.AddMarkupContent(1,"Reconfigure the Data Protection service in ASP.NET to use an external Redis instance for key ring storage.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Reconfigure the Data Protection service in ASP.NET to use an external Redis instance for key ring storage.");
+            },
 			Img = "/images/Icon_down-arrow.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"CredHub Client",
-			Description = (b => {
-				b.AddMarkupContent(1,"Interact directly with a CredHub secrets store in an ASP.NET application.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Interact directly with a CredHub secrets store in an ASP.NET application.");
+            },
 			Img = "/images/Icon_security.svg"
 		}
-	};
-}
\ No newline at end of file
+    ];
+}
diff --git a/src/Client/Components/Pages/Security/Jwt.razor b/src/Client/Components/Pages/Security/Jwt.razor
deleted file mode 100644
index 2b4d54b..0000000
--- a/src/Client/Components/Pages/Security/Jwt.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/security-providers/get-started/jwt"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="JWT Web Tokens"
-						 ParentLinkName="Security Providers"
-						 ParentLinkUrl="/security-providers"
-						 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/security/jwt.html")">JWT security guide</NavLink>
-    </Title>
-</Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/security/jwt.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/Redirects.razor b/src/Client/Components/Pages/Security/Redirects.razor
new file mode 100644
index 0000000..dea99bf
--- /dev/null
+++ b/src/Client/Components/Pages/Security/Redirects.razor
@@ -0,0 +1,27 @@
+@page "/security-providers/get-started/{Provider}"
+@page "/security-providers/get-started/sso/{Provider}"
+@page "/security-providers/get-started/sso/openid/{Provider}"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    [Parameter] public string Provider { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/security/{TranslateProviderName(Provider)}.html");
+    }
+
+    private static string TranslateProviderName(string provider)
+    {
+        return provider.ToLower() switch
+        {
+            "framework" => "sso-openid-framework",
+            "oauth" => "sso-oauth",
+            "sso" or "openid" => "sso-openid-netcore",
+            _ => provider
+        };
+    }
+}
diff --git a/src/Client/Components/Pages/Security/Redisstore.razor b/src/Client/Components/Pages/Security/Redisstore.razor
deleted file mode 100644
index 6568b24..0000000
--- a/src/Client/Components/Pages/Security/Redisstore.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/security-providers/get-started/redisstore"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Key Ring with Redis"
-							 ParentLinkName="Security Providers"
-							 ParentLinkUrl="/security-providers"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/security/redisstore.html")">Key Ring storage with Redis guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/security/redisstore.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/Sso_OAuth.razor b/src/Client/Components/Pages/Security/Sso_OAuth.razor
deleted file mode 100644
index e30f310..0000000
--- a/src/Client/Components/Pages/Security/Sso_OAuth.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/security-providers/get-started/sso/oauth"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Cloud Foundry Single Sign-on with OAuth2"
-						 ParentLinkName="Security Providers"
-						 ParentLinkUrl="/security-providers"
-						 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/security/sso-oauth.html")">SSO with OAuth guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/security/sso-oauth.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/Sso_OpenID.razor b/src/Client/Components/Pages/Security/Sso_OpenID.razor
deleted file mode 100644
index f44340c..0000000
--- a/src/Client/Components/Pages/Security/Sso_OpenID.razor
+++ /dev/null
@@ -1,25 +0,0 @@
-@page "/security-providers/get-started/sso"
-@page "/security-providers/get-started/sso/openid"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Cloud Foundry Single Sign-on with OpenID Connect"
-						 ParentLinkName="Security Providers"
-						 ParentLinkUrl="/security-providers"
-						 ShowGetStarted="true" />
-
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/security/sso-openid-netcore.html")">OpenID Connect guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/security/sso-openid-netcore.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/Security/Sso_OpenID_Framework.razor b/src/Client/Components/Pages/Security/Sso_OpenID_Framework.razor
deleted file mode 100644
index 1b60b5f..0000000
--- a/src/Client/Components/Pages/Security/Sso_OpenID_Framework.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/security-providers/get-started/sso/openid/framework"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Cloud Foundry Single Sign-on with OpenID Connect (.NET Framework)"
-						 ParentLinkName="Security Providers"
-						 ParentLinkUrl="/security-providers"
-						 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/security/sso-openid-framework.html")">OpenID Connect guide for .NET Framework</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/security/sso-openid-framework.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Gemfire.razor b/src/Client/Components/Pages/ServiceConnectors/Gemfire.razor
deleted file mode 100644
index aac4d43..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Gemfire.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-connectors/get-started/gemfire"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Apache Geode/GemFire Cache"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/")">connector guides</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/GettingStarted.razor b/src/Client/Components/Pages/ServiceConnectors/GettingStarted.razor
deleted file mode 100644
index edc5ebf..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/GettingStarted.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/service-connectors/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-					     ParentLinkName="Service connectors"
-					     ParentLinkUrl="/service-connectors" />
-<GetStarted>
-    <ComponentName>Service Connectors</ComponentName>
-    <Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-    </Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Index.razor b/src/Client/Components/Pages/ServiceConnectors/Index.razor
index cc9877c..7ac87b9 100644
--- a/src/Client/Components/Pages/ServiceConnectors/Index.razor
+++ b/src/Client/Components/Pages/ServiceConnectors/Index.razor
@@ -1,54 +1,60 @@
 @page "/service-connectors"
 @page "/steeltoe-connectors"
 
-<Template Name="Service Connectors" Features="@features" DocsURL="/docs/connectors">
-	<Description>One of the many advantages of running applications on the cloud is the easy availability of a variety of backing services. Steeltoe simplifies using those services by automatically configuring and wiring up connections to common services like Redis, RabbitMQ, MySQL, MS SQL, and more.</Description>
-	<WhatIs>Backing services are must when creating cloud-native .NET applications, but managing the connections can be time consuming and annoying. Steeltoe Service Connectors takes that pain away and let you get back to doing what you love.</WhatIs>
+<Template Name="Service Connectors" Features="@_features" DocsUrl="/docs/connectors" MetaDescription="Use Steeltoe to ease the transition from locally-hosted services to bound services in your cloud hosted environment.">
+    <Description>
+        One of the many advantages of running applications on the cloud is the easy availability of a variety of backing services.
+        Steeltoe simplifies using those services by automatically configuring and wiring up connections to common services like Redis, RabbitMQ, MySQL, Microsoft SQL Server, and more.
+    </Description>
+    <WhatIs>
+        Backing services are must when creating cloud-native .NET applications, but managing the connections can be time-consuming and annoying.
+        Steeltoe Service Connectors takes that pain away and let you get back to doing what you love.
+    </WhatIs>
 	<WhyUse>
-		Steeltoe Connectors provide out-of-the-box support for discovering many common services on a cloud platform. They also include the ability to use settings-based configuration so that developers can supply configuration settings at development and testing time but then have those settings be overridden when pushing the application to the platform.
+        Steeltoe Connectors provide out-of-the-box support for discovering many common services on a cloud platform.
+        They also include the ability to use settings-based configuration so that developers can supply configuration settings at development and testing time but then have those settings be overridden when pushing the application to the platform.
 	</WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Database connector",
-			Description = (b => {
-				b.AddMarkupContent(1,"Discover and connect to databases such as Microsoft SQL, MySQL, PostgreSQL, and MongoDB.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Discover and connect to databases such as Microsoft SQL, MySQL, PostgreSQL, and MongoDB.");
+            },
 			Img = "/images/Icon_box.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Cache and Messaging connectors",
-			Description = (b => {
-				b.AddMarkupContent(1,"Discover and connect to Redis or GemFire/Apache Geode cache. Also easily interact with a RabbitMQ service instance.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Discover and connect to Redis or GemFire/Apache Geode cache. Also easily interact with a RabbitMQ service instance.");
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"OAuth2 service client",
-			Description = (b => {
-				b.AddMarkupContent(1,"Automatically get OAuth2 service instance configuration data injected into your ASP.NET application.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Automatically get OAuth2 service instance configuration data injected into your ASP.NET application.");
+            },
 			Img = "/images/Icon_keys.svg"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/ServiceConnectors/Mongo.razor b/src/Client/Components/Pages/ServiceConnectors/Mongo.razor
deleted file mode 100644
index 9cb4a68..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Mongo.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/service-connectors/get-started/mongo"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Mongo Database"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-	<Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/mongo.html")">MongoDB connector guide</NavLink>
-	</Title>
-</Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/mongo.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Mssql.razor b/src/Client/Components/Pages/ServiceConnectors/Mssql.razor
deleted file mode 100644
index 20fe875..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Mssql.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/service-connectors/get-started/mssql"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Microsoft SQL Database"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/mssql.html")">Microsoft SQL Server Connector Guide</NavLink>
-    </Title>
-</Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/mssql.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Mysql.razor b/src/Client/Components/Pages/ServiceConnectors/Mysql.razor
deleted file mode 100644
index 7d1e933..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Mysql.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-connectors/get-started/mysql"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="MySQL Database"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-	<Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/mysql.html")">MySQL Connector Guide</NavLink>
-	</Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/mysql.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Oauth.razor b/src/Client/Components/Pages/ServiceConnectors/Oauth.razor
deleted file mode 100644
index 7ce8783..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Oauth.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/service-connectors/get-started/oauth"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="OAuth2 Client"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
- <Tutorial>
-     <Title>
-         This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/oauth.html")">OAuth Connector Guide</NavLink>
-     </Title>
- </Tutorial>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/oauth.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Postgresql.razor b/src/Client/Components/Pages/ServiceConnectors/Postgresql.razor
deleted file mode 100644
index 614ad28..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Postgresql.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-connectors/get-started/postgresql"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="PostgreSQL Database"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/postgresql.html")">PostgreSQL Connector Guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/postgresql.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Rabbit.razor b/src/Client/Components/Pages/ServiceConnectors/Rabbit.razor
deleted file mode 100644
index 55c98a5..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Rabbit.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-connectors/get-started/rabbit"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="RabbitMQ Messaging"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/rabbitmq.html")">Redis Connector Guide</NavLink>
-    </Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/rabbitmq.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Redirects.razor b/src/Client/Components/Pages/ServiceConnectors/Redirects.razor
new file mode 100644
index 0000000..8b9f0b1
--- /dev/null
+++ b/src/Client/Components/Pages/ServiceConnectors/Redirects.razor
@@ -0,0 +1,23 @@
+@page "/service-connectors/get-started/{Provider}"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    [Parameter] public string Provider { get; set; } = string.Empty;
+
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/service-connectors/{TranslateProviderName(Provider)}.html");
+    }
+
+    private static string TranslateProviderName(string provider)
+    {
+        return provider.ToLower() switch
+        {
+            "rabbit" => "rabbitmq",
+            _ => provider
+        };
+    }
+}
diff --git a/src/Client/Components/Pages/ServiceConnectors/Redis.razor b/src/Client/Components/Pages/ServiceConnectors/Redis.razor
deleted file mode 100644
index dd03374..0000000
--- a/src/Client/Components/Pages/ServiceConnectors/Redis.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-connectors/get-started/redis"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Redis Cache"
-							 ParentLinkName="Service connectors"
-							 ParentLinkUrl="/service-connectors"
-							 ShowGetStarted="true" />
-<Tutorial>
-    <Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/redis.html")">Redis Connector Guide</NavLink>
-	</Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-connectors/redis.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceDiscovery/Consul.razor b/src/Client/Components/Pages/ServiceDiscovery/Consul.razor
deleted file mode 100644
index 4668c8c..0000000
--- a/src/Client/Components/Pages/ServiceDiscovery/Consul.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-discovery/get-started/consul"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Consul Service Discovery"
-						 ParentLinkName="Service Discovery"
-						 ParentLinkUrl="/service-discovery"
-						 ShowGetStarted="true" />
-<Tutorial>
-	<Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-discovery/consul.html")">Consul guide</NavLink>
-	</Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-discovery/consul.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceDiscovery/Eureka.razor b/src/Client/Components/Pages/ServiceDiscovery/Eureka.razor
deleted file mode 100644
index 1d4fac3..0000000
--- a/src/Client/Components/Pages/ServiceDiscovery/Eureka.razor
+++ /dev/null
@@ -1,23 +0,0 @@
-@page "/service-discovery/get-started/eureka"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Eureka Service Discovery"
-						 ParentLinkName="Service Discovery"
-						 ParentLinkUrl="/service-discovery"
-						 ShowGetStarted="true" />
-<Tutorial>
-	<Title>
-        This page has moved, use the new <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/service-discovery/eureka.html")">Eureka guide</NavLink>
-	</Title>
-</Tutorial>
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/service-discovery/eureka.html").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceDiscovery/GettingStarted.razor b/src/Client/Components/Pages/ServiceDiscovery/GettingStarted.razor
deleted file mode 100644
index 80ebc21..0000000
--- a/src/Client/Components/Pages/ServiceDiscovery/GettingStarted.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-@page "/service-discovery/get-started"
-@inject IHttpContextAccessor HttpContextAccessor
-@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
-<Breadcrumbs NavName="Getting Started"
-						 ParentLinkName="Service Discovery"
-						 ParentLinkUrl="/service-discovery" />
-<GetStarted>
-	<ComponentName>Service Discovery</ComponentName>
-	<Tutorials>
-        <h1>This page has moved, find the new location <NavLink href="@(DocsSiteOptions.Value.BaseAddress + "/guides/")">here</NavLink></h1>
-	</Tutorials>
-</GetStarted>
-
-@code
-{
-    protected override void OnInitialized()
-    {
-        if (HttpContextAccessor.HttpContext != null)
-        {
-            var uri = new Uri(DocsSiteOptions.Value.BaseAddress + "/guides/").ToString();
-            HttpContextAccessor.HttpContext.Response.Redirect(uri, true);
-        }
-    }
-}
diff --git a/src/Client/Components/Pages/ServiceDiscovery/Index.razor b/src/Client/Components/Pages/ServiceDiscovery/Index.razor
index e11d1cb..db8861f 100644
--- a/src/Client/Components/Pages/ServiceDiscovery/Index.razor
+++ b/src/Client/Components/Pages/ServiceDiscovery/Index.razor
@@ -1,62 +1,73 @@
-@page "/service-discovery"
+@page "/service-discovery"
 @page "/steeltoe-discovery"
 
-<Template Name="Service Discovery" DocsURL="/docs/discovery" Features="@features">
-	<Description>A service registry provides a database that applications can use to implement the Service Discovery pattern, one of the key tenets of a microservices-based architecture. Trying to hand-configure each client of a service or adopt some form of access convention can be difficult and prove to be brittle in production. Instead, applications can use a service registry to dynamically discover and call registered services.</Description>
-	<WhatIs>Think of it as a phone book of services. Instead of needing to configure a service's exact URI, your app “asks” the service registry to look up the URI of a named service. The name is what your app remembers, the URI is what's discovered. Your app could also register itself for discovery. Then you could distribute the name used during registration for others to discover.</WhatIs>
+<Template Name="Service Discovery" DocsUrl="/docs/discovery" Features="@_features" MetaDescription="Use Steeltoe to participate in service registration and service discovery with your .NET applications.">
+    <Description>
+        A service registry provides a database that applications can use to implement the Service Discovery pattern, one of the key tenets of a microservices-based architecture.
+        Trying to hand-configure each client of a service or adopt some form of access convention can be difficult and prove to be brittle in production.
+        Instead, applications can use a service registry to dynamically discover and call registered services.
+    </Description>
+    <WhatIs>
+        Think of it as a phone book of services.
+        Instead of needing to configure a service's exact URI, your app &quot;asks&quot; the service registry to look up the URI of a named service.
+        The name is what your app remembers, the URI is what's discovered.
+        Your app could also register itself for discovery.
+        Then you could distribute the name used during registration for others to discover.
+    </WhatIs>
 	<WhyUse>
-		With the ability to discover and register URIs, services within an organization are far less coupled. In turn services are more mobile, can be updated easily, and each can follow different availability patterns.<br /><br />
+        With the ability to discover and register URIs, services within an organization are far less coupled.
+        In turn services are more mobile, can be updated easily, and each can follow different availability patterns.<br /><br />
 		Duplicated registries in multiple locations, registering URIs to route requests between multiple data centers, and registering different versions of the same service are just a few of the benefits.
 	</WhyUse>
 	<FeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
+			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
 		</div>
 	</FeatureTemplate>
 	<AltFeatureTemplate Context="Feature">
 		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
+			<div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/></div></div>
 		</div>
 	</AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Support for Multiple Registries",
-			Description = (b => {
-				b.AddMarkupContent(1,"The Steeltoe discovery client removes any dependencies to a specific registry. With support for Eureka as well as HashiCorp Consul, you have flexibility with little to no code change when choosing the right registry.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"The Steeltoe discovery client removes any dependencies to a specific registry. With support for Eureka as well as HashiCorp Consul, you have flexibility with little to no code change when choosing the right registry.");
+            },
 			Img = "/images/Icon_computers.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Logging & Health Checks Built In",
-			Description = (b => {
-				b.AddMarkupContent(1,"Service registry logs are automatically fed to your app’s logging interface, and health contributors are automatically configured and made available to your application.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Service registry logs are automatically fed to your app&apos;s logging interface, and health contributors are automatically configured and made available to your application.");
+            },
 			Img = "/images/Icon_cloud.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Register and Discover Services",
-			Description = (b => {
-				b.AddMarkupContent(1,"With just a few lines of code, your app can use a registry to discover services as well as registering itself for discovery.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"With just a few lines of code, your app can use a registry to discover services as well as registering itself for discovery.");
+            },
 			Img = "/images/Icon_device-network.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Request Load Balancing",
-			Description = (b => {
-				b.AddMarkupContent(1,"When a service as registered multiple instances, configure the client to balance requests across instances. Options for random, round robin, as well as building your own are available in Steeltoe Service Discovery.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"When a service as registered multiple instances, configure the client to balance requests across instances. Options for random, round robin, as well as building your own are available in Steeltoe Service Discovery.");
+            },
 			Img = "/images/Icon_data-transfer.svg"
 		}
-	};
-}
\ No newline at end of file
+    ];
+}
diff --git a/src/Client/Components/Pages/ServiceDiscovery/Redirects.razor b/src/Client/Components/Pages/ServiceDiscovery/Redirects.razor
new file mode 100644
index 0000000..fc47165
--- /dev/null
+++ b/src/Client/Components/Pages/ServiceDiscovery/Redirects.razor
@@ -0,0 +1,14 @@
+@page "/service-discovery/{Provider}"
+
+@inject NavigationManager Navigation
+@inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+
+@code
+{
+    [Parameter] public string Provider { get; set; }
+
+    protected override void OnParametersSet()
+    {
+        Navigation.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/guides/service-discovery/{Provider}.html");
+    }
+}
diff --git a/src/Client/Components/Pages/Support.razor b/src/Client/Components/Pages/Support.razor
index a81bcdf..edf4fcd 100644
--- a/src/Client/Components/Pages/Support.razor
+++ b/src/Client/Components/Pages/Support.razor
@@ -1,67 +1,66 @@
 @page "/support"
 
-<Template Name="Support" Features="@features">
+<Template Name="Support" Features="@_features" MetaDescription="Get support for Steeltoe OSS.">
 	<Description>Contact the team directly to get answers about how to best implement every component and feature within Steeltoe, as well as the best cloud-native .NET practices.</Description>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] {
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Slack",
-			Description = (b => {
-				b.AddMarkupContent(1,"Stay up to date with the latest announcements, open a direct conversation with the team, or ask a general question to the community.<br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","https://slack.steeltoe.io");
-					b.AddAttribute(4, "NewWindow",true);
-					b.AddAttribute(5, "AsButton",true);
-					b.AddAttribute(6, "ChildContent", (RenderFragment)((b) => {b.AddContent(7, "GO NOW");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Stay up to date with the latest announcements, open a direct conversation with the team, or ask a general question to the community.<br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","https://slack.steeltoe.io");
+                b.AddAttribute(4, "NewWindow",true);
+                b.AddAttribute(5, "AsButton",true);
+                b.AddAttribute(6, "ChildContent", (RenderFragment)(child => { child.AddContent(7, "GO NOW"); }));
+                b.CloseComponent();
+            },
 			Img = "https://assets.brandfolder.com/pl546j-7le8zk-838dm2/view@2x.png?v=1547165068"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"GitHub",
-			Description = (b => {
-				b.AddMarkupContent(1,"Search past issues and community questions, request a new feature, or donate your custom features to a project.<br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","https://github.com/SteeltoeOSS");
-					b.AddAttribute(4, "NewWindow",true);
-					b.AddAttribute(5, "AsButton",true);
-					b.AddAttribute(6, "ChildContent", (RenderFragment)((b) => {b.AddContent(7, "GO NOW");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Search past issues and community questions, request a new feature, or donate your custom features to a project.<br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","https://github.com/SteeltoeOSS");
+                b.AddAttribute(4, "NewWindow",true);
+                b.AddAttribute(5, "AsButton",true);
+                b.AddAttribute(6, "ChildContent", (RenderFragment)(child => { child.AddContent(7, "GO NOW"); }));
+                b.CloseComponent();
+            },
 			Img = "https://github.githubassets.com/images/modules/logos_page/GitHub-Logo.png"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"NuGet",
-			Description = (b => {
-				b.AddMarkupContent(1,"Search and learn more about each Steeltoe package, its version history, statistics, and installation options.<br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","https://www.nuget.org/profiles/SteeltoeOSS");
-					b.AddAttribute(4, "NewWindow",true);
-					b.AddAttribute(5, "AsButton",true);
-					b.AddAttribute(6, "ChildContent", (RenderFragment)((b) => {b.AddContent(7, "GO NOW");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Search and learn more about each Steeltoe package, its version history, statistics, and installation options.<br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","https://www.nuget.org/profiles/SteeltoeOSS");
+                b.AddAttribute(4, "NewWindow",true);
+                b.AddAttribute(5, "AsButton",true);
+                b.AddAttribute(6, "ChildContent", (RenderFragment)(child => {child.AddContent(7, "GO NOW");}));
+                b.CloseComponent();
+            },
 			Img = "https://miro.medium.com/max/700/1*OH_L2dLIKDl_n5QknfONqw.png"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/Training.razor b/src/Client/Components/Pages/Training.razor
index d3de76a..96b813e 100644
--- a/src/Client/Components/Pages/Training.razor
+++ b/src/Client/Components/Pages/Training.razor
@@ -1,54 +1,61 @@
-@page "/training"
+@page "/training"
 
-<Template Name="Training & Certification" Features="@features">
-	<Description>Increase your mastery of Steeltoe with official training and certification from VMware. Every course is laser-focused to equip you with the skills you need to be a successful Steeltoe practitioner in your chosen discipline. You can validate your learning with an industry-recognized certification. Courses are instructor-led, either in person or online. Some are also available privately onsite.</Description>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
+<Banner Href="mailto:info@Steeltoe.io?subject=Steeltoe%20Training">
+    Standardized formal training sessions are not currently offered, but we can work something out to meet your needs. Click here to email us if you are interested!
+</Banner>
+
+<Template Name="Training & Certification" Features="@_features" MetaDescription="Contact us if you need training for using Steeltoe OSS.">
+    <Description>
+        Increase your mastery of Steeltoe with official training from VMware.
+        Every course is laser-focused to equip you with the skills you need to be a successful Steeltoe practitioner in your chosen discipline.
+        You can validate your learning with an industry-recognized certification.
+        Courses are instructor-led, either in person or online. Some are also available privately onsite.
+    </Description>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 
-@code{
-	private Feature[] features = new[] {
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Pivotal Platform Acceleration Lab for .NET Developers",
-			Description = (RenderFragment)(b => {
-				b.AddMarkupContent(1,"Experience best practices building cloud-native applications in a hands-on setting with Pivotal educators and consultants. The program is focused on enabling customers and partners through \"doing it\" rather than \"talking about it\".<br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","https://store.education.pivotal.io/confirm-course?courseid=EDU-1180");
-					b.AddAttribute(4, "NewWindow",true);
-					b.AddAttribute(5, "AsButton",true);
-					b.AddAttribute(6, "ChildContent", (RenderFragment)((b) => {b.AddContent(7, "LEAN MORE");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Experience best practices building cloud-native applications in a hands-on setting with Pivotal educators and consultants. The program is focused on enabling customers and partners through \"doing it\" rather than \"talking about it\".<br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","https://store.education.pivotal.io/confirm-course?courseid=EDU-1180");
+                b.AddAttribute(4, "NewWindow",true);
+                b.AddAttribute(5, "AsButton",true);
+                b.AddAttribute(6, "ChildContent", (RenderFragment)(child => { child.AddContent(7, "LEAN MORE"); }));
+                b.CloseComponent();
+            },
 			Img = "/images/Icon_computer.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Pivotal Certified Developer .NET",
-			Description = (RenderFragment)(b => {
-				b.AddMarkupContent(1,"The performance-based Pivotal Certified Developer Exam is designed to test and validate your understanding of and familiarity with Tanzu Application Service, ASP.NET Core, RESTful APIs, and cloud-native patterns.<br /><br />");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","https://store.education.pivotal.io/confirm-course?courseid=EDU-1198");
-					b.AddAttribute(4, "NewWindow",true);
-					b.AddAttribute(5, "AsButton",true);
-					b.AddAttribute(6, "ChildContent", (RenderFragment)((b) => {b.AddContent(7, "LEAN MORE");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"The performance-based Pivotal Certified Developer Exam is designed to test and validate your understanding of and familiarity with Tanzu Application Service, ASP.NET Core, RESTful APIs, and cloud-native patterns.<br /><br />");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","https://store.education.pivotal.io/confirm-course?courseid=EDU-1198");
+                b.AddAttribute(4, "NewWindow",true);
+                b.AddAttribute(5, "AsButton",true);
+                b.AddAttribute(6, "ChildContent", (RenderFragment)(child => { child.AddContent(7, "LEAN MORE"); }));
+                b.CloseComponent();
+            },
 			Img = "/images/Icon_keys.svg"
 		}
-	};
-}
\ No newline at end of file
+    ];
+}
diff --git a/src/Client/Components/Pages/Web-Applications.razor b/src/Client/Components/Pages/Web-Applications.razor
index 65d737f..0e57d5b 100644
--- a/src/Client/Components/Pages/Web-Applications.razor
+++ b/src/Client/Components/Pages/Web-Applications.razor
@@ -1,96 +1,69 @@
 @page "/web-application"
 @page "/web-applications"
 
-<Template Name="Web Applications" Features="@features">
-	<Description>Steeltoe makes building web applications fast and hassle-free. By removing much of the boilerplate code and configuration associated with web development, you get a modern web programming model that streamlines the development of server-side HTML applications, REST APIs, and bidirectional, event-based systems.</Description>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col">
-				<div class="component-feature-title">@Feature.Title</div>
-				<div class="component-feature-desc">@Feature.Description</div>
-			</div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" /></div></div>
-		</div>
-	</AltFeatureTemplate>
-	<!-- OtherArea>
-		<div class="col text-center m-5">
-			<div class="mb-5"><h2>Ready to get started?</h2></div>
-			<div class=""><Href href="/get-started" AsButton="true">TRY THESE TUTORIALs</Href></div>
-		</div>
-	</OtherArea -->
+<Template Name="Web Applications" Features="@_features" MetaDescription="Level up your .NET code and explore what Spring can do for you.">
+    <Description>
+        Steeltoe makes building web applications fast and hassle-free. By removing much of the boilerplate code and configuration associated with web development,
+        you get a modern web programming model that streamlines the development of server-side HTML applications, REST APIs, and bidirectional, event-based systems.
+    </Description>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
-@code{
-	private Feature[] features = new[] {
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Developer productivity",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe is the starting point of your developer experience, whatever you’re building. Steeltoe is designed to get you up and running as quickly as possible, with minimal upfront configuration. Using .NET's  embedded application servers, you can be serving in seconds.<br /><br />Steeltoe’s out-of-the-box, production-ready features (like tracing, metrics, and health status) provide developers with deep insight into their applications.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe is the starting point of your developer experience, whatever you&apos;re building. Steeltoe is designed to get you up and running as quickly as possible, with minimal upfront configuration. Using .NET's  embedded application servers, you can be serving in seconds.<br /><br />Steeltoe&apos;s out-of-the-box, production-ready features (like tracing, metrics, and health status) provide developers with deep insight into their applications.");
+            },
 			Img = "/images/Icon_down-arrow.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Battle-tested security",
-			Description = (b => {
-				b.AddMarkupContent(1,"When it’s time to secure your web application, ");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","/security-providers");
-					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "Steeltoe Security Providers");}));
-				b.CloseComponent();
-				b.AddMarkupContent(6," supports industry-standard authentication protocols, including OAuth and OpenID Connect. <br /><br />Get protection from top OWASP attacks, such as session fixation, clickjacking, cross-site request forgery, and more.<br /><br />");
-//				b.OpenComponent<Href>(7);
-//					b.AddAttribute(8, "href","/security-providers/get-started");
-//					b.AddAttribute(9, "AsButton",true);
-//					b.AddAttribute(10, "ChildContent", (RenderFragment)((b) => {b.AddContent(11, "Get started with Security Providers");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"When it&apos;s time to secure your web application, ");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","/security-providers");
+                b.AddAttribute(4, "ChildContent", (RenderFragment)(child => { child.AddContent(5, "Steeltoe Security Providers"); }));
+                b.CloseComponent();
+                b.AddMarkupContent(6," supports industry-standard authentication protocols, including OAuth and OpenID Connect. <br /><br />Get protection from top OWASP attacks, such as session fixation, click-jacking, cross-site request forgery, and more.<br /><br />");
+            },
 			Img = "/images/Icon_security.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"App configuration in the cloud",
-			Description = (b => {
-				b.AddMarkupContent(1,"In the cloud, configuration can’t simply be embedded inside the application. The configuration has to be flexible enough to cope with multiple applications, environments, and service instances, as well as deal with dynamic changes without downtime. Steeltoe's ");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","/app-config");
-					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "Spring Config Provider");}));
-				b.CloseComponent();
-				b.AddMarkupContent(6," is designed to ease these burdens and offers integration with version control systems like Git to help you keep your configuration safe.<br /><br />");
-//				b.OpenComponent<Href>(7);
-//					b.AddAttribute(8, "href","/app-configuration/get-started/springconfig");
-//					b.AddAttribute(9, "AsButton",true);
-//					b.AddAttribute(10, "ChildContent", (RenderFragment)((b) => {b.AddContent(11, "Get started with App Configuration");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"In the cloud, configuration can&apos;t simply be embedded inside the application. The configuration has to be flexible enough to cope with multiple applications, environments, and service instances, as well as deal with dynamic changes without downtime. Steeltoe's ");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","/app-config");
+                b.AddAttribute(4, "ChildContent", (RenderFragment)(child => { child.AddContent(5, "Spring Config Provider"); }));
+                b.CloseComponent();
+                b.AddMarkupContent(6," is designed to ease these burdens and offers integration with version control systems like Git to help you keep your configuration safe.<br /><br />");
+            },
 			Img = "/images/Icon_tool.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Data access made easy",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe helps developers connect their web applications to a number of data stores. It supports relational, non-relational databases, and cloud-based data services.<br /> ");
-//				b.OpenComponent<Href>(2);
-//					b.AddAttribute(3, "href","/service-connectors/get-started/mssql");
-//					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "MS SQL");}));
-//				b.CloseComponent();
-//				b.AddMarkupContent(6,", ");
-//				b.OpenComponent<Href>(7);
-//					b.AddAttribute(8, "href","/service-connectors/get-started/postgres");
-//					b.AddAttribute(9, "ChildContent", (RenderFragment)((b) => {b.AddContent(10, "Postgres");}));
-//				b.CloseComponent();
-//				b.AddMarkupContent(11,", or ");
-//				b.OpenComponent<Href>(12);
-//					b.AddAttribute(13, "href","/service-connectors/get-started/mysql");
-//					b.AddAttribute(14, "ChildContent", (RenderFragment)((b) => {b.AddContent(15, "MySQL");}));
-//				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe helps developers connect their web applications to a number of data stores. It supports relational, non-relational databases, and cloud-based data services.<br /> ");
+            },
 			Img = "/images/Icon_box.svg"
 		}
-	};
+    ];
 }
diff --git a/src/Client/Components/Pages/Why-Steeltoe.razor b/src/Client/Components/Pages/Why-Steeltoe.razor
index faf564b..e2bb9e2 100644
--- a/src/Client/Components/Pages/Why-Steeltoe.razor
+++ b/src/Client/Components/Pages/Why-Steeltoe.razor
@@ -1,29 +1,22 @@
-@page "/why-steeltoe"
+@page "/why-steeltoe"
 
-<Template Name="Why Steeltoe" ShowBottomGetStarted="false" Features="@features">
-	<Description>Steeltoe provides a collection of libraries that helps users build production-grade cloud-native applications using externalized configuration, service discovery, circuit-breakers, distributed tracing, application management, and more.  Steeltoe also provides a seamless way to build, configure, and run event-driven microservice applications and stream-based data processing applications. </Description>
-	<FeatureTemplate Context="Feature">
-		<div class="col-sm-6 pr-sm-5">
-			<div class="component-feature-title">@Feature.Title</div>
-			<div class="row no-gutters">
-				<div class="col-sm-3 component-why-img">
-					<img src="@Feature.Img" class="img-fluid" />
-				</div>
-				<div class="col component-feature-desc mb-5">@Feature.Description</div>
-			</div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="col-sm-6 pl-sm-5">
-			<div class="component-feature-title">@Feature.Title</div>
-			<div class="row no-gutters">
-				<div class="col-sm-3 component-why-img">
-					<img src="@Feature.Img" class="img-fluid" />
-				</div>
-				<div class="col component-feature-desc mb-5">@Feature.Description</div>
-			</div>
-		</div>
-	</AltFeatureTemplate>
+<Template Name="Why Steeltoe" ShowBottomGetStarted="false" Features="@_features" MetaDescription="Level up your .NET code and explore what Steeltoe can do for you.">
+    <Description>
+        Steeltoe provides a collection of libraries that helps users build production-grade cloud-native applications using externalized configuration, service discovery, circuit-breakers, distributed tracing, application management, and more.
+        Steeltoe also provides a seamless way to build, configure, and run event-driven microservice applications and stream-based data processing applications.
+    </Description>
+    <FeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+        </div>
+    </FeatureTemplate>
+    <AltFeatureTemplate Context="Feature">
+        <div class="row component-feature no-gutters">
+            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+        </div>
+    </AltFeatureTemplate>
 </Template>
 <div class="width-all bg-dk-midnight-blue pt-5">
 	<div class="width-70 container text-white">
@@ -31,80 +24,82 @@
 		<div class="">
 			<div class="row no-gutters">
 				<div class="col component-dark"><Href href="/microservices">
-					<div class="text-center"><img class="img-fluid" src="/images/icon-microservices-white.svg" /></div>
+					<div class="text-center"><img class="img-fluid" src="/images/icon-microservices-white.svg" alt="Steeltoe helps build microservices." /></div>
 					<div class="title text-white"><h3>Microservices</h3></div>
 					<div class="desc text-white">Quickly deliver production‑grade features with independently evolvable microservices.</div>
 				</Href></div>
 				
 				<div class="col component-dark"><Href href="/cloud">
-					<div class="text-center"><img class="img-fluid" src="/images/icon-cloud-white.svg" /></div>
+					<div class="text-center"><img class="img-fluid" src="/images/icon-cloud-white.svg" alt="Steeltoe helps build apps for the cloud." /></div>
 					<div class="title text-white"><h3>Cloud</h3></div>
-					<div class="desc text-white">Your code, any cloud—we’ve got you covered. Connect and scale your services, whatever your platform.</div>
+					<div class="desc text-white">Your code, any cloud—we&apos;ve got you covered. Connect and scale your services, whatever your platform.</div>
 				</Href></div>
 				
 				<div class="col component-dark"><Href href="/web-applications">
-					<div class="text-center"><img class="img-fluid" src="/images/icon-webapps-white.svg" /></div>
+					<div class="text-center"><img class="img-fluid" src="/images/icon-webapps-white.svg" alt="Steeltoe helps with web apps." /></div>
 					<div class="title text-white"><h3>Web Apps</h3></div>
 					<div class="desc text-white">A collection of libraries for fast, secure, and responsive web applications connected to any data store.</div>
 				</Href></div>
-				
-				@*<div class="col component-dark"><Href href="/event-driven">
-					<div class="text-center"><img class="img-fluid" src="/images/icon-streams-white.svg" /></div>
-					<div class="title text-white"><h3>Event Driven</h3></div>
-					<div class="desc text-white">Integrate with your enterprise. React to business events. Act on your streaming data in realtime. </div>
-				</Href></div>*@
 			</div>
 		</div>
 	</div>
 </div>
 
-@code{
-	private Feature[] features = new[] { 
-		new Feature() {
+@code
+{
+	private readonly Feature[] _features =
+    [
+        new Feature
+        {
 			Title = (MarkupString)"Steeltoe is proven",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe’s libraries are trusted by developers all over the world. Steeltoe delivers delightful experiences to millions of end-users every day. Steeltoe also has contributions from development teams at VMware, Microsoft, and more.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe&apos;s libraries are trusted by developers all over the world. Steeltoe delivers delightful experiences to millions of end-users every day. Steeltoe also has contributions from development teams at VMware, Microsoft, and more.");
+            },
 			Img = "/images/img-everywhere-2573c9d8470aed5621745921ac8733c8.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe is flexible",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe’s flexible and comprehensive set of extensions and third-party libraries let developers build almost any web application imaginable. At its core, Steeltoe’s features provide the foundation for a wide-ranging set of features and functionality. Whether you’re building secure, cloud-based microservices for the web, or complex streaming data flows for the enterprise, Steeltoe provides the tools to help.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe&apos;s flexible and comprehensive set of extensions and third-party libraries let developers build almost any web application imaginable. At its core, Steeltoe&apos;s features provide the foundation for a wide-ranging set of features and functionality. Whether you&apos;re building secure, cloud-based microservices for the web, or complex streaming data flows for the enterprise, Steeltoe provides the tools to help.");
+            },
 			Img = "/images/img-flexible-a5992de389ba231fc0dd93479df70b62.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe is productive",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe transforms how you approach .NET programming tasks.  Steeltoe builds on the .NET runtime libraries and streamlines your experience by providing much of the necessary glue code for you application. Steeltoe also provide a polyglot experience to you.  Steeltoe supports many of Spring Cloud’s rich set of libraries, config servers, patterns, and templates, to safely deploy entire microservices-based architectures into the cloud.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe transforms how you approach .NET programming tasks.  Steeltoe builds on the .NET runtime libraries and streamlines your experience by providing much of the necessary glue code for you application. Steeltoe also provide a polyglot experience to you.  Steeltoe supports many of Spring Cloud&apos;s rich set of libraries, config servers, patterns, and templates, to safely deploy entire microservices-based architectures into the cloud.");
+            },
 			Img = "/images/img-innovative-16683bc64538d1462c6b77930f8b71ee.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe is fast",
-			Description = (b => {
-				b.AddMarkupContent(1,"Developer productivity is one of Steeltoe’s superpowers. Steeltoe helps developers build applications with ease and with far less toil than other competing paradigms. You can even start a new Steeltoe project in seconds, with the Steeltoe Initializr at ");
-				b.OpenComponent<Href>(2);
-					b.AddAttribute(3, "href","https://start.steeltoe.io");
-					b.AddAttribute(4, "ChildContent", (RenderFragment)((b) => {b.AddContent(5, "start.steeltoe.io");}));
-				b.CloseComponent();
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Developer productivity is one of Steeltoe&apos;s superpowers. Steeltoe helps developers build applications with ease and with far less toil than other competing paradigms. You can even start a new Steeltoe project in seconds, with the Steeltoe Initializr at ");
+                b.OpenComponent<Href>(2);
+                b.AddAttribute(3, "href","https://start.steeltoe.io");
+                b.AddAttribute(4, "ChildContent", (RenderFragment)(child => { child.AddContent(5, "start.steeltoe.io"); }));
+                b.CloseComponent();
+            },
 			Img = "/images/img-fast-f8bdb07b7bf02133827ec6bd3069eb29.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe is secure",
-			Description = (b => {
-				b.AddMarkupContent(1,"Steeltoe has a proven track record of remediating security issues quickly and responsibly. The Steeltoe committers work with security professionals to patch and test any reported vulnerabilities. Third-party dependencies are also monitored closely, and regular updates are issued to help keep your data and applications as safe as possible. In addition, Steeltoe Security makes it easier for you to integrate with industry-standard security schemes and deliver trustworthy solutions that are secure by default.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"Steeltoe has a proven track record of remediating security issues quickly and responsibly. The Steeltoe committers work with security professionals to patch and test any reported vulnerabilities. Third-party dependencies are also monitored closely, and regular updates are issued to help keep your data and applications as safe as possible. In addition, Steeltoe Security makes it easier for you to integrate with industry-standard security schemes and deliver trustworthy solutions that are secure by default.");
+            },
 			Img = "/images/img-secure-9a8f8b676bec21edfc4a9809c6cfa646.svg"
 		},
-		new Feature() {
+		new Feature
+        {
 			Title = (MarkupString)"Steeltoe is supportive",
-			Description = (b => {
-				b.AddMarkupContent(1,"The Steeltoe community is global, diverse, and spans folks of all ages and capabilities, from complete beginners to seasoned pros. No matter where you are on your journey, you can find the support and resources you need to get you to the next level: guides & tutorials, videos, support, and even access to the development team on Slack.");
-			}),
+			Description = b => {
+                b.AddMarkupContent(1,"The Steeltoe community is global, diverse, and spans folks of all ages and capabilities, from complete beginners to seasoned pros. No matter where you are on your journey, you can find the support and resources you need to get you to the next level: guides & tutorials, videos, support, and even access to the development team on Slack.");
+            },
 			Img = "/images/img-indemand-3f63d4a71b8af531028c46842a45cf49.svg"
 		}
-	};
-}
\ No newline at end of file
+    ];
+}
diff --git a/src/Client/Components/Routes.razor b/src/Client/Components/Routes.razor
deleted file mode 100644
index f835e48..0000000
--- a/src/Client/Components/Routes.razor
+++ /dev/null
@@ -1,8 +0,0 @@
-@using Steeltoe.Client.Components.Layout
-
-<Router AppAssembly="@typeof(Program).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-    </Found>
-</Router>
-
diff --git a/src/Client/Components/Template.razor b/src/Client/Components/Template.razor
index bcb5040..a9f7d5e 100644
--- a/src/Client/Components/Template.razor
+++ b/src/Client/Components/Template.razor
@@ -1,27 +1,25 @@
-@inject IJSRuntime JSRuntime
+<PageTitle>Steeltoe | @Name</PageTitle>
+<HeadContent>
+    <meta name="description" content="@MetaDescription">
+</HeadContent>
 
-<CustomPageTitle Title="@(Name)" />
 <div class="width-all bg-yellow">
 	<div class="width-90 container">
-		<div class="row no-gutters">
-			<div class="col component-title">@Name</div>
-		</div>
-		<div class="row no-gutters">
-			<div class="col component-desc">@Description</div>
-		</div>
+		<div class="row no-gutters"><div class="col component-title">@Name</div></div>
+		<div class="row no-gutters"><div class="col component-desc">@Description</div></div>
 	</div>
 </div>
 <div class="width-all yellow-slant">
 	<div class="width-90 container">
 		<div class="row no-gutters">
-			@if (GettingStartedURL != null) {
-			<div class="col offset-@(DocsURL==null?"4":"2")">
-				<Href Class="component-button" href="@(GettingStartedURL)">GET STARTED</Href>
+			@if (GettingStartedUrl != null) {
+			<div class="col offset-@(DocsUrl==null?"4":"2")">
+				<Href Class="component-button" href="@(GettingStartedUrl)">GET STARTED</Href>
 			</div>
 			}
-			@if (DocsURL != null) {
-			<div class="col @(GettingStartedURL==null?"offset-4":"")">
-				<Href Class="component-button" href="@(DocsURL)">READ THE DOCS</Href>
+			@if (DocsUrl != null) {
+			<div class="col @(GettingStartedUrl==null?"offset-4":"")">
+				<Href Class="component-button" href="@(DocsUrl)">READ THE DOCS</Href>
 			</div>
 			}
 		</div>
@@ -29,7 +27,7 @@
 </div>
 <div class="width-all">
 	<div class="width-90 container">
-		<div class="@((WhatIs != null || WhyUse != null ? "border-bottom-steeltoe-blue":"") + " row no-gutters")" style="@((WhatIs != null || WhyUse != null ? "margin-bottom:7%;padding-bottom:7%":""))">
+		<div class="@((WhatIs != null || WhyUse != null ? "border-bottom-steeltoe-blue":"") + " row no-gutters")" style="@(WhatIs != null || WhyUse != null ? "margin-bottom:7%;padding-bottom:7%":"")">
 			@if (WhatIs != null) {
 			<div class="col-sm mr-sm-2">
 				<div class="row no-gutters">
@@ -59,11 +57,11 @@
 			</div>
 			}
 		</div>
-		@if(Features != null) {
+		@if (Features != null) {
 			<div class="row no-gutters">
 				@foreach (var feature in Features) {
 					if(AltFeatureTemplate != null) {
-						if((i % 2) == 0){
+						if(_i % 2 == 0){
 							@FeatureTemplate(feature)
 						}else{
 							@AltFeatureTemplate(feature);
@@ -72,25 +70,25 @@
 						@FeatureTemplate(feature)
 					}
 
-					i++;
+					_i++;
 				}
 			</div>
 		}
-		<div class="row no-gutters" style="@((GettingStartedURL == null && DocsURL == null) || (DocsURL == null && !ShowBottomGetStarted) ? "":"margin: 7% 0 7% 0;")">
-			@if (GettingStartedURL != null && ShowBottomGetStarted) {
-				<div class="col offset-@(DocsURL==null&&ShowBottomGetStarted?"4":"2")">
-					<Href Class="component-button" href="@(GettingStartedURL)">GET STARTED</Href>
+		<div class="row no-gutters" style="@((GettingStartedUrl == null && DocsUrl == null) || (DocsUrl == null && !ShowBottomGetStarted) ? "":"margin: 7% 0 7% 0;")">
+			@if (GettingStartedUrl != null && ShowBottomGetStarted) {
+				<div class="col offset-@(DocsUrl==null&&ShowBottomGetStarted?"4":"2")">
+					<Href Class="component-button" href="@(GettingStartedUrl)">GET STARTED</Href>
 				</div>
 			}
-			@if (DocsURL != null && ShowBottomDocsUrl) {
-				<div class="col @(GettingStartedURL==null&&ShowBottomDocsUrl?"offset-4":"")">
-					<Href Class="component-button" href="@DocsURL">READ THE DOCS</Href>
+			@if (DocsUrl != null && ShowBottomDocsUrl) {
+				<div class="col @(GettingStartedUrl==null&&ShowBottomDocsUrl?"offset-4":"")">
+					<Href Class="component-button" href="@DocsUrl">READ THE DOCS</Href>
 				</div>
 			}
 		</div>
 	</div>
 </div>
-@if(OtherArea != null) {
+@if (OtherArea != null) {
 	<div class="width-all">
 		<div class="width-90 container">
 			<div class="row no-gutters">
@@ -100,44 +98,29 @@
 	</div>
 }
 
-@code {
-	private int i = 0;
-	[Parameter]
-	public String Name { get; set; }
-
-	[Parameter]
-	public bool NameIsPlural { get; set; } = false;
-
-	[Parameter]
-	public bool ShowBottomGetStarted { get; set; } = true;
-
-	[Parameter]
-	public bool ShowBottomDocsUrl { get; set; } = true;
-
-	[Parameter]
-	public RenderFragment Description { get; set; }
-
-	[Parameter]
-	public RenderFragment WhatIs { get; set; }
-
-	[Parameter]
-	public RenderFragment WhyUse { get; set; }
-
-	[Parameter]
-	public RenderFragment<Feature> FeatureTemplate { get; set; }
-
-	[Parameter]
-	public RenderFragment<Feature> AltFeatureTemplate { get; set; } = null;
-
-	[Parameter]
-	public IReadOnlyList<Feature> Features { get; set; } = null;
+@code
+{
+	private int _i = 0;
 
-	[Parameter]
-	public string GettingStartedURL { get; set; }
+	[Parameter] public string Name { get; set; }
+    [Parameter] public string MetaDescription { get; set; }
+	[Parameter] public bool NameIsPlural { get; set; } = false;
+	[Parameter] public bool ShowBottomGetStarted { get; set; } = true;
+	[Parameter] public bool ShowBottomDocsUrl { get; set; } = true;
+	[Parameter] public RenderFragment Description { get; set; }
+	[Parameter] public RenderFragment WhatIs { get; set; }
+	[Parameter] public RenderFragment WhyUse { get; set; }
+	[Parameter] public RenderFragment<Feature> FeatureTemplate { get; set; }
+	[Parameter] public RenderFragment<Feature> AltFeatureTemplate { get; set; } = null;
+	[Parameter] public IReadOnlyList<Feature> Features { get; set; } = null;
+	[Parameter] public string GettingStartedUrl { get; set; }
+	[Parameter] public string DocsUrl { get; set; }
+	[Parameter] public RenderFragment OtherArea { get; set; }
 
-	[Parameter]
-	public string DocsURL { get; set; }
+    public override Task SetParametersAsync(ParameterView parameters)
+    {
+        Name = !string.IsNullOrEmpty(Name) ? "Steeltoe | " + Name : "Steeltoe";
 
-	[Parameter]
-	public RenderFragment OtherArea { get; set; }
+        return base.SetParametersAsync(parameters);
+    }
 }
diff --git a/src/Client/Components/Tip.razor b/src/Client/Components/Tip.razor
deleted file mode 100644
index f604954..0000000
--- a/src/Client/Components/Tip.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="tip">
- <div class="row m-0" style="background-color:#1abc9c">
-  <div class="col-12 m-0 tip-title">tip</div>
- </div>
- <div class="row m-0" style="background-color:#dbfaf4">
-  <div class="col-12 m-0 tip-desc">
-   @Message 
-   @ChildContent
-  </div>
- </div>
-</div>
-
-@code {
-	[Parameter]
-	public RenderFragment Message { get; set; } = null;
-	[Parameter]
-	public RenderFragment ChildContent { get; set; } = null;
-}
diff --git a/src/Client/Components/Tutorial.razor b/src/Client/Components/Tutorial.razor
deleted file mode 100644
index 9b57be7..0000000
--- a/src/Client/Components/Tutorial.razor
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="width-all">
- <div class="width-90 container">
-  <div class="row no-gutters">
-   <div class="col tutorial-title">
-    <h2>@Title</h2>
-   </div>
-  </div>
-  <div class="row no-gutters">
-   <div class="col tutorial-desc">@Description</div>
-  </div>
-	<div class="tutorial-steps">
-		@TutorialSteps
-	</div>
- </div>
-</div>
-
-@code {
-	[Parameter]
-	public RenderFragment TutorialSteps { get; set; }
-	[Parameter]
-	public RenderFragment Title { get; set; }
-	[Parameter]
-	public RenderFragment Description { get; set; }
-}
diff --git a/src/Client/Models/CalendarEvent.cs b/src/Client/Models/CalendarEvent.cs
index 9bdc9ab..900f356 100644
--- a/src/Client/Models/CalendarEvent.cs
+++ b/src/Client/Models/CalendarEvent.cs
@@ -1,13 +1,12 @@
-namespace Steeltoe.Client.Models
+namespace Steeltoe.Client.Models;
+
+public class CalendarEvent
 {
-    public class CalendarEvent
-    {
-        public string Date { get; set; }
+    public string Date { get; set; }
 
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public string URL { get; set; }
-    }
+    public string URL { get; set; }
 }
diff --git a/src/Client/Models/CalendarEventOptions.cs b/src/Client/Models/CalendarEventOptions.cs
index 35dac75..1427eba 100644
--- a/src/Client/Models/CalendarEventOptions.cs
+++ b/src/Client/Models/CalendarEventOptions.cs
@@ -1,9 +1,6 @@
-using System.Collections.Generic;
+namespace Steeltoe.Client.Models;
 
-namespace Steeltoe.Client.Models
+public class CalendarEventOptions
 {
-    public class CalendarEventOptions
-    {
-        public List<CalendarEvent> Events { get; set; } = new();
-    }
+    public List<CalendarEvent> Events { get; set; } = [];
 }
diff --git a/src/Client/Models/DocsSiteOptions.cs b/src/Client/Models/DocsSiteOptions.cs
index ea8d963..1205813 100644
--- a/src/Client/Models/DocsSiteOptions.cs
+++ b/src/Client/Models/DocsSiteOptions.cs
@@ -1,35 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Steeltoe.Client.Models
+namespace Steeltoe.Client.Models;
+
+public class DocsSiteOptions
 {
-    public class DocsSiteOptions
-    {
-        [Required]
-        public string BaseAddress { get; set; }
-
-        public string ApiBrowserHome { get; set; }
-        public string BlogHome { get; set; }
-        public string DocsHome { get; set; }
-        public string DocsStreamHome { get; set; }
-        public string GuidesHome { get; set; }
-        public string FileShareHome { get; set; }
-        public string DynamicLoggingHome { get; set; }
-
-        public void SetUrls()
-        {
-            ApiBrowserHome = ConfigureIfMissing(ApiBrowserHome, $"{BaseAddress}/api/browser/v3/all");
-            BlogHome = ConfigureIfMissing(BlogHome, $"{BaseAddress}/articles/");
-            DocsHome = ConfigureIfMissing(DocsHome, $"{BaseAddress}/api/v3/welcome/");
-            DocsStreamHome = ConfigureIfMissing(DocsStreamHome, $"{BaseAddress}/api/v3/stream/");
-            GuidesHome = ConfigureIfMissing(GuidesHome, $"{BaseAddress}/guides/");
-            FileShareHome = ConfigureIfMissing(FileShareHome, $"{BaseAddress}/api/v3/fileshares/");
-            DynamicLoggingHome = ConfigureIfMissing(DynamicLoggingHome, $"{BaseAddress}/api/v3/logging/");
-        }
-
-        private static string ConfigureIfMissing(string value, string defaultValue)
-        {
-            return !string.IsNullOrWhiteSpace(value) ?
-                value : defaultValue;
-        }
-    }
+    [Required] public string BaseAddress { get; set; } = "https://docs.steeltoe.io";
+
+    public string ApiBrowserHome => $"{BaseAddress}/api/browser/v3/all";
+
+    public string BlogHome => $"{BaseAddress}/articles/";
+
+    public string DocsHome => $"{BaseAddress}/api/v3/welcome/";
+
+    public string DocsStreamHome => $"{BaseAddress}/api/v3/stream/";
+
+    public string GuidesHome => $"{BaseAddress}/guides/";
+
+    public string FileShareHome => $"{BaseAddress}/api/v3/fileshares/";
+
+    public string DynamicLoggingHome => $"{BaseAddress}/api/v3/logging/";
 }
diff --git a/src/Client/Models/Feature.cs b/src/Client/Models/Feature.cs
index e45cc39..a7be810 100644
--- a/src/Client/Models/Feature.cs
+++ b/src/Client/Models/Feature.cs
@@ -1,11 +1,12 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Steeltoe.Client.Models
+namespace Steeltoe.Client.Models;
+
+public class Feature
 {
-    public class Feature
-    {
-        public MarkupString Title { get; set; }
-        public RenderFragment Description { get; set; }
-        public string Img { get; set; }
-    }
+    public MarkupString Title { get; set; }
+
+    public RenderFragment Description { get; set; }
+
+    public string Img { get; set; }
 }
diff --git a/src/Client/Program.cs b/src/Client/Program.cs
index fc83760..262c2c3 100644
--- a/src/Client/Program.cs
+++ b/src/Client/Program.cs
@@ -10,21 +10,12 @@
     options.AddPolicy(name: "DocumentationPolicy",
            policy =>
            {
-               policy.AllowAnyOrigin()
-                       .AllowAnyHeader()
-                       .WithMethods("GET");
+               policy.AllowAnyOrigin().AllowAnyHeader().WithMethods("GET");
            });
 });
 
 builder.Services.Configure<CalendarEventOptions>(builder.Configuration.GetSection("CalendarEvents"));
-builder.Services.AddHttpContextAccessor();
-builder.Services.AddOptions<DocsSiteOptions>()
-    .Bind(builder.Configuration.GetSection("DocsSite"))
-    .ValidateDataAnnotations()
-    .PostConfigure(docsSiteOptions =>
-    {
-        docsSiteOptions.SetUrls();
-    });
+builder.Services.Configure<DocsSiteOptions>(builder.Configuration.GetSection("DocsSite"));
 
 var app = builder.Build();
 
diff --git a/src/Client/appsettings.Docker.json b/src/Client/appsettings.Docker.json
deleted file mode 100644
index 4c0ecf7..0000000
--- a/src/Client/appsettings.Docker.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Microsoft.AspNetCore.Hosting": "Information"
-    }
-  },
-  "DocsSite": {
-    "BaseAddress": "http://localhost:9082"
-  }
-}
diff --git a/src/Client/appsettings.json b/src/Client/appsettings.json
index fd6a51c..74b9fa6 100644
--- a/src/Client/appsettings.json
+++ b/src/Client/appsettings.json
@@ -7,9 +7,6 @@
     }
   },
   "AllowedHosts": "*",
-  "DocsSite": {
-    "BaseAddress": "https://docs.steeltoe.io"
-  },
   "CalendarEvents": {
     "Events": [
       {
@@ -25,37 +22,19 @@
         "url": "https://docs.steeltoe.io/articles/releases/steeltoe-3-1-minor-release-major-deal.html"
       },
       {
-        "date": "<span>June</span> 14 2021",
-        "title": "Steeltoe 3.1.0 Release Candidate 2 is now available",
-        "description": "This is the second and final release candidate for Steeltoe 3.1.0. Take a look and tell us what you think.",
-        "url": "https://github.com/SteeltoeOSS/Steeltoe/releases/tag/3.1.0-rc2"
-      },
-      {
-        "date": "<span>May</span> 10 2021",
-        "title": "Steeltoe 3.1.0 Release Candidate 1 is now available",
-        "description": "Steeltoe 3.1.0 brings the new Steeltoe Stream feature built on our RabbitMQ messaging components to the .NET community. Take a look and give us your thoughts.",
-        "url": "https://github.com/SteeltoeOSS/Steeltoe/releases/tag/3.1.0-rc1"
-      },
-      {
-        "date": "<span>january</span> 14 2021",
+        "date": "<span>January</span> 14 2021",
         "title": "Create .NET Microservice Projects Automatically with Steeltoe Initializr",
         "description": "Get started using Initializr and get to production faster!",
         "url": "https://docs.steeltoe.io/articles/create-dotnet-microservice-projects-automatically-with-steeltoe-initializr.html"
       },
       {
-        "date": "<span>november</span> 17 2020",
-        "title": "Writing Event Based Microservices using Steeltoe",
-        "description": "In this session see how to create message based microservices using Steeltoe.",
-        "url": "https://docs.steeltoe.io/articles/writing-event-based-microservices-using-steeltoe.html"
-      },
-      {
-        "date": "<span>october</span> 1 2020",
+        "date": "<span>October</span> 1 2020",
         "title": "Use Kubernetes for Modern .NET Apps with Steeltoe and Tye",
         "description": "Learn about new Kubernetes features included in Steeltoe 3.0 and use Tye to help develop for K8s.",
         "url": "https://docs.steeltoe.io/articles/tech-tutorial-use-kubernetes-for-modern-net-apps-steeltoe-and-project-tye-are-your-path-to-productivity.html"
       },
       {
-        "date": "<span>august</span> 24 2020",
+        "date": "<span>August</span> 24 2020",
         "title": "Steeltoe 3.0 is officially available",
         "description": "Version 3.0 is packed with messaging, kubernetes support, new ways to implement endpoints, and so much more.",
         "url": "https://docs.steeltoe.io/articles/releases/steeltoe-3-0-packs-a-mighty-punch-with-many-new-features.html"
diff --git a/src/Client/wwwroot/js/functions.js b/src/Client/wwwroot/js/functions.js
deleted file mode 100644
index 3acb1ee..0000000
--- a/src/Client/wwwroot/js/functions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function setPageTitle(title) {
-    document.title = title;
-}
diff --git a/src/Steeltoe-MainSite.sln b/src/Steeltoe-MainSite.sln
index 70cd3b2..50d11f6 100644
--- a/src/Steeltoe-MainSite.sln
+++ b/src/Steeltoe-MainSite.sln
@@ -8,8 +8,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96418E41-4D12-4743-958D-42C677EB9DA8}"
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
-		..\docker-compose.yaml = ..\docker-compose.yaml
-		..\Dockerfile = ..\Dockerfile
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject

From 4ac8ce39047acec2e8ebe64dca254541e789eaf4 Mon Sep 17 00:00:00 2001
From: Tim Hess <tim.hess@broadcom.com>
Date: Wed, 4 Sep 2024 14:15:54 -0500
Subject: [PATCH 2/6] show banner on mobile, keep content centered and reduce
 pill content spillage

---
 src/Client/Components/Banner.razor | 12 +++++-------
 src/Client/wwwroot/css/mobile.css  |  6 +-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Client/Components/Banner.razor b/src/Client/Components/Banner.razor
index be76bdb..6eb1182 100644
--- a/src/Client/Components/Banner.razor
+++ b/src/Client/Components/Banner.razor
@@ -1,13 +1,11 @@
 <div class="banner">
 	<Href href="@Href" NewWindow="@NewWindow">
-		<div class="row no-gutters align-items-center">
-			<div class="col-2" style="margin: .7% 3% .7% 5%;max-width: 11%;">
-				<div class="sign rounded-pill special-link">
-				<div style="padding: 2px;">@BannerTypeName</div>
-			</div>
-			</div>
+		<div class="row no-gutters text-center" style="padding: 1% 0">
 			<div class="col desc">
-				@ChildContent
+                <div class="sign rounded-pill special-link text-center" style="min-width:125px;max-width:200px;display:inline-block;margin:10px;">
+                    <div style="padding: 4px 4px 0 4px;">@BannerTypeName</div>
+                </div>
+                @ChildContent
 			</div>
 		</div>
 	</Href>
diff --git a/src/Client/wwwroot/css/mobile.css b/src/Client/wwwroot/css/mobile.css
index 4b51b5f..5161d55 100644
--- a/src/Client/wwwroot/css/mobile.css
+++ b/src/Client/wwwroot/css/mobile.css
@@ -1,4 +1,4 @@
-@media (max-width: 576px) {
+@media (max-width: 576px) {
     .width-90 {
         max-width: 97%;
     }
@@ -100,10 +100,6 @@
         padding-right: 15px;
     }
 
-    .banner {
-        display: none;
-    }
-
     .docs-nav-col {
         top: 231px;
         width: 180px;

From 2b4404f720e7a805c36bb1aee3de2b2ba2c2fede Mon Sep 17 00:00:00 2001
From: Tim Hess <tim.hess@broadcom.com>
Date: Thu, 5 Sep 2024 16:51:09 -0500
Subject: [PATCH 3/6] address BL0007 and improve docs redirection remove broken
 link from initializr page sort meta tags and expose more of them in the
 template

---
 src/Client/Components/App.razor               | 37 +++++++++----------
 src/Client/Components/Pages/Cloud.razor       |  4 +-
 src/Client/Components/Pages/Community.razor   |  2 +-
 src/Client/Components/Pages/Doc.razor         | 26 +++++++------
 src/Client/Components/Pages/Home.razor        | 18 +++++++++
 .../Components/Pages/Initializr/Index.razor   |  4 +-
 src/Client/Components/Template.razor          | 20 ++++++++--
 7 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/src/Client/Components/App.razor b/src/Client/Components/App.razor
index bdd0c08..e15ae68 100644
--- a/src/Client/Components/App.razor
+++ b/src/Client/Components/App.razor
@@ -15,28 +15,25 @@
     <meta charset="utf-8">
     <meta content="width=device-width,initial-scale=1.0" name="viewport">
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <meta property="og:image" content="https://steeltoe.io/images/favicon.png">
     <meta property="og:type" content="website">
-    <meta property="og:url" content="https://www.steeltoe.io"/>
-    <meta property="og:image" content="https://steeltoe.io/images/favicon.png"/>
-    <meta content="Create cloud-native .NET microservices with Steeltoe." name="DC.Title" xml:lang="EN">
-    <meta content="cloud-native, .net, dotnet, framework, cloud, developer" name="DC.Subject" xml:lang="EN">
-    <meta content="EN" name="DC.Language" scheme="dcterms:RFC1766">
-    <meta content="https://steeltoe.io/" name="DC.Identifier" schema="DCterms:URI">
-    <meta content="text/html" name="DC.Format" schema="DCterms:IMT">
-    <meta content="Pivotal Software" name="DC.Creator">
-    <meta content="Steeltoe OSS" name="DC.Publisher">
-    <meta content="info@steeltoe.io" name="DC.Publisher.Address">
-    <meta content="Steeltoe OSS" name="DC.Contributor">
-    <meta content="2019-10-03" name="DC.Date" scheme="ISO8601">
-    <meta content="text/html" name="DC.Type">
-    <meta content="Copyright © 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term &quot;Broadcom&quot; refers to Broadcom Inc. and/or its subsidiaries." name="DC.Rights">
-    <base href="/"/>
-    <link rel="canonical" href="https://steeltoe.io/">
-    <link rel="icon" href="/images/favicon.png" type="image/png"/>
+    <meta name="DC.Contributor" content="Steeltoe OSS">
+    <meta name="DC.Creator" content="Pivotal Software">
+    <meta name="DC.Date" content="2019-10-03" scheme="ISO8601">
+    <meta name="DC.Format" content="text/html" schema="DCterms:IMT">
+    <meta name="DC.Identifier" content="https://steeltoe.io/" schema="DCterms:URI">
+    <meta name="DC.Language" content="EN" scheme="dcterms:RFC1766">
+    <meta name="DC.Publisher" content="Steeltoe OSS">
+    <meta name="DC.Publisher.Address" content="info@steeltoe.io">
+    <meta name="DC.Rights" content="Copyright © 2005-@(DateTime.Now.Year) Broadcom. All Rights Reserved. The term &quot;Broadcom&quot; refers to Broadcom Inc. and/or its subsidiaries.">
+    <meta name="DC.Subject" content="cloud-native, .net, dotnet, framework, cloud, developer" xml:lang="EN">
+    <meta name="DC.Type" content="text/html">
+    <base href="/">
+    <link rel="icon" href="/images/favicon.png" type="image/png">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
-    <link rel="stylesheet" href="css/fonts.css"/>
-    <link rel="stylesheet" href="css/site.css"/>
-    <link rel="stylesheet" href="css/mobile.css"/>
+    <link rel="stylesheet" href="css/fonts.css">
+    <link rel="stylesheet" href="css/site.css">
+    <link rel="stylesheet" href="css/mobile.css">
     <HeadOutlet/>
 </head>
 <body>
diff --git a/src/Client/Components/Pages/Cloud.razor b/src/Client/Components/Pages/Cloud.razor
index 32e1f84..cf26d78 100644
--- a/src/Client/Components/Pages/Cloud.razor
+++ b/src/Client/Components/Pages/Cloud.razor
@@ -1,6 +1,8 @@
 @page "/cloud"
 
-<Template Name="Cloud" Features="@_features" MetaDescription="Level up your .NET code and explore what Steeltoe can do for you.">
+<Template Name="Cloud" Features="@_features"
+          MetaDescription="Level up your .NET code and explore what Steeltoe can do for you in the cloud."
+          SocialShareTitle="Use Steeltoe to build .NET apps for the cloud.">
     <Description>
         Developing distributed systems can be challenging. Complexity is moved from the application layer to the network layer and demands greater interaction between services.
         Making your code &apos;cloud-native&apos; means dealing with <Href href="https://12factor.net" NewWindow="true">12-factor</Href> issues such as external configuration, statelessness, logging, and connecting to backing services.
diff --git a/src/Client/Components/Pages/Community.razor b/src/Client/Components/Pages/Community.razor
index 1af3958..33940ba 100644
--- a/src/Client/Components/Pages/Community.razor
+++ b/src/Client/Components/Pages/Community.razor
@@ -14,7 +14,7 @@
 						<a href="https://docs.google.com/document/d/1Um9FmlgOb4QiU2bNdg9oXLadWyDgW1167QXH9HUG068/">Meeting Agenda and Notes link</a><br />
 						Zoom meeting ID: 926 8707 7667<br />
 						Passcode: 224068<br />
-						<a href="https://VMware.zoom.us/j/92687077667?pwd=NXpPWWxlMVlEREZuNHRta2JlS2dZdz09">Zoom invite link</a>
+                        <a href="https://broadcom.zoom.us/j/92687077667?pwd=NXpPWWxlMVlEREZuNHRta2JlS2dZdz09">Zoom invite link</a>
 						<br />
 					</div>
 					<br />
diff --git a/src/Client/Components/Pages/Doc.razor b/src/Client/Components/Pages/Doc.razor
index 84ba532..fd9becf 100644
--- a/src/Client/Components/Pages/Doc.razor
+++ b/src/Client/Components/Pages/Doc.razor
@@ -17,23 +17,25 @@ Redirecting to new docs site, please hold.
 
 @code
 {
-    private int _version;
     private const int CurrentVersion = 3;
-    private const string DefaultComponent = "welcome";
 
     [Parameter] public string Area { get; set; } = "index";
-
-    [Parameter] public string Component { get; set; } = DefaultComponent;
-
-    [Parameter]
-    public int Version
-    {
-        get => _version;
-        set => _version = value is < 2 or > 3 ? CurrentVersion : value;
-    }
+    [Parameter] public string Component { get; set; } = "welcome";
+    [Parameter] public int? Version { get; set; }
 
     protected override void OnParametersSet()
     {
-        NavigationManager.NavigateTo($"{DocsSiteOptions.Value.BaseAddress}/api/v{Version}/{Component}/{Area}.html", true);
+        if (Version is null or < 2 or > CurrentVersion)
+        {
+            Version = CurrentVersion;
+        }
+
+        var uri = $"{DocsSiteOptions.Value.BaseAddress}/api/v{Version}/{Component}/";
+        if (Area != null)
+        {
+            uri += $"{Area}.html";
+        }
+
+        NavigationManager.NavigateTo(uri, true);
     }
 }
diff --git a/src/Client/Components/Pages/Home.razor b/src/Client/Components/Pages/Home.razor
index fbf3600..1c2e535 100644
--- a/src/Client/Components/Pages/Home.razor
+++ b/src/Client/Components/Pages/Home.razor
@@ -3,10 +3,16 @@
 
 @inject IOptions<CalendarEventOptions> CalendarEventOptions
 @inject IOptionsSnapshot<DocsSiteOptions> DocsSiteOptions
+@inject NavigationManager Navigation
 
 <PageTitle>Steeltoe | Home</PageTitle>
 <HeadContent>
     <meta name="description" content="Steeltoe is an open-source project providing a library collection that helps users build production-grade cloud-native applications using externalized configuration, database connectors, service discovery, logging and distributed tracing, application management, security, and more.">
+    <meta name="DC.Title" content="Create cloud-native .NET microservices with Steeltoe." xml:lang="EN" />
+    <meta property="og:title" content="Create cloud-native .NET microservices with Steeltoe." />
+    <meta property="og:description" content="Create .NET microservices for modern platforms with Steeltoe. It's a friend of Spring Cloud and can be used anywhere." />
+    <meta property="og:url" content="@_canonicalUrl" />
+    <link rel="canonical" href="@_canonicalUrl" />
 </HeadContent>
 
 <div class="bg-midnight-blue text-white width-all">
@@ -112,3 +118,15 @@ else
 }
     </div>
 </div>
+@code
+{
+    private string _canonicalUrl;
+
+    public override Task SetParametersAsync(ParameterView parameters)
+    {
+        var requestUri = new Uri(Navigation.Uri);
+        _canonicalUrl = "https://steeltoe.io" + requestUri.PathAndQuery;
+
+        return base.SetParametersAsync(parameters);
+    }
+}
diff --git a/src/Client/Components/Pages/Initializr/Index.razor b/src/Client/Components/Pages/Initializr/Index.razor
index 514153a..db54512 100644
--- a/src/Client/Components/Pages/Initializr/Index.razor
+++ b/src/Client/Components/Pages/Initializr/Index.razor
@@ -39,7 +39,7 @@
                     From there, you can run the project as a web-based service. Out of the box you'll get all the <Href href="https://github.com/SteeltoeOSS/initializr" NewWindow="true">default dependencies</Href> along with endpoints for interaction.
                     Try the below curl command that uses our hosted Initializr service to get started.<br /><br />
                     <pre><code style="color:white">curl https://start.steeltoe.io/starter.zip -d "dependencies=Actuators,DynamicLogger,SQL Server" -d "projectName=MyCompany.MySample" -o "myProject.zip"</code></pre>
-				</div>
+                </div>
 			</div>
 			<div class="col component-whyuse-desc">
 				<h4>Browser UI</h4>
@@ -57,7 +57,7 @@
 		</div>
 		<div class="row mb-5 no-gutters">
 			<div class="col component-whyuse-desc">
-                No matter the way you choose to use Initializr, the value is in the distribution of pre-packaged dependencies. The <Href href="xxxx" target="_blank">default dependencies</Href> included in Initializr are mostly Steeltoe focused.
+                No matter the way you choose to use Initializr, the value is in the distribution of pre-packaged dependencies. The default dependencies included in Initializr are mostly Steeltoe focused.
                 Things like database connectors, a Spring Cloud Config Server client, a Consul service discovery client, and many others. But this is a community driven project, so it only makes sense to offer ways for the .NET community to contribute.<br /><br />
 				<h4>Creating private dependencies</h4>
                 Running Initializr in-house isn&apos;t just about limited network connections. The Steeltoe Initializr is meant to be extended.
diff --git a/src/Client/Components/Template.razor b/src/Client/Components/Template.razor
index a9f7d5e..b776068 100644
--- a/src/Client/Components/Template.razor
+++ b/src/Client/Components/Template.razor
@@ -1,6 +1,13 @@
+@inject NavigationManager Navigation
+
 <PageTitle>Steeltoe | @Name</PageTitle>
 <HeadContent>
-    <meta name="description" content="@MetaDescription">
+    <meta name="description" content="@MetaDescription" />
+    <meta name="DC.Title" content="@(SocialShareTitle ?? Name)" xml:lang="EN" />
+    <meta property="og:title" content="@(SocialShareTitle ?? Name)" />
+    <meta property="og:description" content="@(SocialShareDescription ?? MetaDescription)" />
+    <meta property="og:url" content="@_canonicalUrl" />
+    <link rel="canonical" href="@_canonicalUrl" />
 </HeadContent>
 
 <div class="width-all bg-yellow">
@@ -27,7 +34,8 @@
 </div>
 <div class="width-all">
 	<div class="width-90 container">
-		<div class="@((WhatIs != null || WhyUse != null ? "border-bottom-steeltoe-blue":"") + " row no-gutters")" style="@(WhatIs != null || WhyUse != null ? "margin-bottom:7%;padding-bottom:7%":"")">
+		<div class="@(WhatIs != null || WhyUse != null ? "border-bottom-steeltoe-blue" : "") row no-gutters"
+             style="@(WhatIs != null || WhyUse != null ? "margin-bottom:7%;padding-bottom:7%" : "")">
 			@if (WhatIs != null) {
 			<div class="col-sm mr-sm-2">
 				<div class="row no-gutters">
@@ -101,10 +109,13 @@
 @code
 {
 	private int _i = 0;
+    private string _canonicalUrl;
 
 	[Parameter] public string Name { get; set; }
     [Parameter] public string MetaDescription { get; set; }
-	[Parameter] public bool NameIsPlural { get; set; } = false;
+    [Parameter] public string SocialShareTitle { get; set; }
+    [Parameter] public string SocialShareDescription { get; set; }
+    [Parameter] public bool NameIsPlural { get; set; } = false;
 	[Parameter] public bool ShowBottomGetStarted { get; set; } = true;
 	[Parameter] public bool ShowBottomDocsUrl { get; set; } = true;
 	[Parameter] public RenderFragment Description { get; set; }
@@ -121,6 +132,9 @@
     {
         Name = !string.IsNullOrEmpty(Name) ? "Steeltoe | " + Name : "Steeltoe";
 
+        var requestUri = new Uri(Navigation.Uri);
+        _canonicalUrl = "https://steeltoe.io" + requestUri.PathAndQuery;
+
         return base.SetParametersAsync(parameters);
     }
 }

From 297381af1a01022bc7dfaa3c3a532c1721a946d0 Mon Sep 17 00:00:00 2001
From: Tim Hess <tim.hess@broadcom.com>
Date: Thu, 5 Sep 2024 17:13:56 -0500
Subject: [PATCH 4/6] use a component for [Alt]Feature instead of repeating the
 everywhere

---
 src/Client/Components/DefaultAltFeature.razor | 16 +++++++
 src/Client/Components/DefaultFeature.razor    |  9 ++++
 .../Pages/AppConfiguration/Index.razor        | 12 -----
 .../Pages/CircuitBreakers/Index.razor         | 12 -----
 src/Client/Components/Pages/Cloud.razor       | 12 -----
 .../Components/Pages/Event-Driven.razor       | 12 -----
 .../Components/Pages/Management/Index.razor   | 12 -----
 .../Components/Pages/Messaging/Index.razor    | 12 -----
 .../Components/Pages/Microservices.razor      | 12 -----
 .../Components/Pages/Security/Index.razor     | 12 -----
 .../Pages/ServiceConnectors/Index.razor       | 12 -----
 .../Pages/ServiceDiscovery/Index.razor        | 12 -----
 src/Client/Components/Pages/Support.razor     | 12 -----
 .../Components/Pages/Web-Applications.razor   | 12 -----
 .../Components/Pages/Why-Steeltoe.razor       | 12 -----
 src/Client/Components/Template.razor          | 45 ++++++++++++++-----
 16 files changed, 60 insertions(+), 166 deletions(-)
 create mode 100644 src/Client/Components/DefaultAltFeature.razor
 create mode 100644 src/Client/Components/DefaultFeature.razor

diff --git a/src/Client/Components/DefaultAltFeature.razor b/src/Client/Components/DefaultAltFeature.razor
new file mode 100644
index 0000000..67123f6
--- /dev/null
+++ b/src/Client/Components/DefaultAltFeature.razor
@@ -0,0 +1,16 @@
+<div class="row component-feature no-gutters">
+    <div class="col-6">
+        <div class="component-feature-title">@Feature.Title</div>
+        <div class="component-feature-desc">@Feature.Description</div>
+    </div>
+    <div class="col-6 text-center">
+        <div class="component-feature-img">
+            <img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/>
+        </div>
+    </div>
+</div>
+
+@code
+{
+    [Parameter] public Feature Feature { get; set; }
+}
diff --git a/src/Client/Components/DefaultFeature.razor b/src/Client/Components/DefaultFeature.razor
new file mode 100644
index 0000000..9c78988
--- /dev/null
+++ b/src/Client/Components/DefaultFeature.razor
@@ -0,0 +1,9 @@
+<div class="row component-feature no-gutters">
+    <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
+    <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+</div>
+
+@code
+{
+    [Parameter] public Feature Feature { get; set; }
+}
diff --git a/src/Client/Components/Pages/AppConfiguration/Index.razor b/src/Client/Components/Pages/AppConfiguration/Index.razor
index 9692c0a..77c7dfb 100644
--- a/src/Client/Components/Pages/AppConfiguration/Index.razor
+++ b/src/Client/Components/Pages/AppConfiguration/Index.razor
@@ -10,18 +10,6 @@
     </Description>
 	<WhatIs>Steeltoe Configuration builds on the .NET configuration API, which enables developers to configure an application with values from a variety of sources by using Configuration Providers.</WhatIs>
 	<WhyUse>With the added providers, Steeltoe Configuration takes care of managing connections to external config servers and provides new resources, such as placeholders and random values.</WhyUse>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/CircuitBreakers/Index.razor b/src/Client/Components/Pages/CircuitBreakers/Index.razor
index a42aca4..d8055d1 100644
--- a/src/Client/Components/Pages/CircuitBreakers/Index.razor
+++ b/src/Client/Components/Pages/CircuitBreakers/Index.razor
@@ -16,18 +16,6 @@
         This gives the failing service time to recover. By using Circuit Breaker frameworks, you can prevent failures from cascading and provide fallback behavior until a failing service is restored to normal operation.
     </WhatIs>
 	<WhyUse>Based on Netflix Hystrix circuit breaker pattern, Steeltoe Circuit Breakers provides applications with an implementation of the same pattern. No external dependencies are introduced by this package, your application can manage circuits completely internal.</WhyUse>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Cloud.razor b/src/Client/Components/Pages/Cloud.razor
index cf26d78..ee59cf7 100644
--- a/src/Client/Components/Pages/Cloud.razor
+++ b/src/Client/Components/Pages/Cloud.razor
@@ -8,18 +8,6 @@
         Making your code &apos;cloud-native&apos; means dealing with <Href href="https://12factor.net" NewWindow="true">12-factor</Href> issues such as external configuration, statelessness, logging, and connecting to backing services.
         Steeltoe with Spring Cloud suite of projects contains many of the services you need to make your applications run in the cloud.
     </Description>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-		</div>
-	</AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Event-Driven.razor b/src/Client/Components/Pages/Event-Driven.razor
index 1c44ee1..02053a8 100644
--- a/src/Client/Components/Pages/Event-Driven.razor
+++ b/src/Client/Components/Pages/Event-Driven.razor
@@ -19,18 +19,6 @@
         Connecting to message platforms, routing messages, transforming messages, processing messages.
         With Steeltoe you can solve these integration challenges quickly and easily.
     </WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-			<div class="col-sm-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/></div></div>
-		</div>
-	</AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Management/Index.razor b/src/Client/Components/Pages/Management/Index.razor
index 2b642ce..9614877 100644
--- a/src/Client/Components/Pages/Management/Index.razor
+++ b/src/Client/Components/Pages/Management/Index.razor
@@ -16,18 +16,6 @@
         Out of the box, Steeltoe provides several easy ways to expose these endpoints over HTTP in .NET applications.
         Of course, you can build and use whatever you would like to meet your needs.
     </WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-		</div>
-	</AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Messaging/Index.razor b/src/Client/Components/Pages/Messaging/Index.razor
index dcd2a88..7e31ca4 100644
--- a/src/Client/Components/Pages/Messaging/Index.razor
+++ b/src/Client/Components/Pages/Messaging/Index.razor
@@ -11,18 +11,6 @@
         It provides a "template" as a high-level abstraction for sending and receiving messages. It also provides support for Message-driven POCOs with a "listener container".
         These libraries facilitate management of AMQP resources while promoting the use of dependency injection and declarative configuration.
     </WhatIs>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Microservices.razor b/src/Client/Components/Pages/Microservices.razor
index 9a62bef..c967a6c 100644
--- a/src/Client/Components/Pages/Microservices.razor
+++ b/src/Client/Components/Pages/Microservices.razor
@@ -9,18 +9,6 @@
     </Description>
 	<WhatIs>Microservices are a modern approach to software whereby application code is delivered in small, manageable pieces, independent of others.</WhatIs>
 	<WhyUse>Their small scale and relative isolation can lead to many additional benefits, such as easier maintenance, improved productivity, greater fault tolerance, better business alignment, and more.</WhyUse>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Security/Index.razor b/src/Client/Components/Pages/Security/Index.razor
index ca5dcd9..fde9e07 100644
--- a/src/Client/Components/Pages/Security/Index.razor
+++ b/src/Client/Components/Pages/Security/Index.razor
@@ -13,18 +13,6 @@
         Cloud Security helps your app achieve that abstraction.
     </WhatIs>
 	<WhyUse>Steeltoe provides a number of Security-related services that simplify using a cloud platform&apos;s security services in ASP.NET applications.</WhyUse>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/ServiceConnectors/Index.razor b/src/Client/Components/Pages/ServiceConnectors/Index.razor
index 7ac87b9..525eb79 100644
--- a/src/Client/Components/Pages/ServiceConnectors/Index.razor
+++ b/src/Client/Components/Pages/ServiceConnectors/Index.razor
@@ -14,18 +14,6 @@
         Steeltoe Connectors provide out-of-the-box support for discovering many common services on a cloud platform.
         They also include the ability to use settings-based configuration so that developers can supply configuration settings at development and testing time but then have those settings be overridden when pushing the application to the platform.
 	</WhyUse>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/ServiceDiscovery/Index.razor b/src/Client/Components/Pages/ServiceDiscovery/Index.razor
index db8861f..590483d 100644
--- a/src/Client/Components/Pages/ServiceDiscovery/Index.razor
+++ b/src/Client/Components/Pages/ServiceDiscovery/Index.razor
@@ -19,18 +19,6 @@
         In turn services are more mobile, can be updated easily, and each can follow different availability patterns.<br /><br />
 		Duplicated registries in multiple locations, registering URIs to route requests between multiple data centers, and registering different versions of the same service are just a few of the benefits.
 	</WhyUse>
-	<FeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-			<div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-		</div>
-	</FeatureTemplate>
-	<AltFeatureTemplate Context="Feature">
-		<div class="row component-feature no-gutters">
-			<div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-			<div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/></div></div>
-		</div>
-	</AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Support.razor b/src/Client/Components/Pages/Support.razor
index edf4fcd..738536a 100644
--- a/src/Client/Components/Pages/Support.razor
+++ b/src/Client/Components/Pages/Support.razor
@@ -2,18 +2,6 @@
 
 <Template Name="Support" Features="@_features" MetaDescription="Get support for Steeltoe OSS.">
 	<Description>Contact the team directly to get answers about how to best implement every component and feature within Steeltoe, as well as the best cloud-native .NET practices.</Description>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 
 @code
diff --git a/src/Client/Components/Pages/Web-Applications.razor b/src/Client/Components/Pages/Web-Applications.razor
index 0e57d5b..7b98497 100644
--- a/src/Client/Components/Pages/Web-Applications.razor
+++ b/src/Client/Components/Pages/Web-Applications.razor
@@ -6,18 +6,6 @@
         Steeltoe makes building web applications fast and hassle-free. By removing much of the boilerplate code and configuration associated with web development,
         you get a modern web programming model that streamlines the development of server-side HTML applications, REST APIs, and bidirectional, event-based systems.
     </Description>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 @code
 {
diff --git a/src/Client/Components/Pages/Why-Steeltoe.razor b/src/Client/Components/Pages/Why-Steeltoe.razor
index e2bb9e2..0873474 100644
--- a/src/Client/Components/Pages/Why-Steeltoe.razor
+++ b/src/Client/Components/Pages/Why-Steeltoe.razor
@@ -5,18 +5,6 @@
         Steeltoe provides a collection of libraries that helps users build production-grade cloud-native applications using externalized configuration, service discovery, circuit-breakers, distributed tracing, application management, and more.
         Steeltoe also provides a seamless way to build, configure, and run event-driven microservice applications and stream-based data processing applications.
     </Description>
-    <FeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-            <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-        </div>
-    </FeatureTemplate>
-    <AltFeatureTemplate Context="Feature">
-        <div class="row component-feature no-gutters">
-            <div class="col-6"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
-            <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-        </div>
-    </AltFeatureTemplate>
 </Template>
 <div class="width-all bg-dk-midnight-blue pt-5">
 	<div class="width-70 container text-white">
diff --git a/src/Client/Components/Template.razor b/src/Client/Components/Template.razor
index b776068..ddad295 100644
--- a/src/Client/Components/Template.razor
+++ b/src/Client/Components/Template.razor
@@ -67,16 +67,41 @@
 		</div>
 		@if (Features != null) {
 			<div class="row no-gutters">
-				@foreach (var feature in Features) {
-					if(AltFeatureTemplate != null) {
-						if(_i % 2 == 0){
-							@FeatureTemplate(feature)
-						}else{
-							@AltFeatureTemplate(feature);
-						}
-					} else {
-						@FeatureTemplate(feature)
-					}
+				@foreach (var feature in Features)
+                {
+                    if (FeatureTemplate == null && AltFeatureTemplate == null)
+                    {
+                        if (_i % 2 == 0)
+                        {
+                            <DefaultFeature Feature="feature"></DefaultFeature>
+                        }
+                        else
+                        {
+                            <DefaultAltFeature Feature="feature"></DefaultAltFeature>
+                        }
+                    }
+                    else
+                    {
+                        if (FeatureTemplate == null)
+                        {
+                            throw new NotImplementedException("This is unexpected");
+                        }
+                        if (AltFeatureTemplate != null)
+                        {
+                            if (_i % 2 == 0)
+                            {
+                                @FeatureTemplate(feature)
+                            }
+                            else
+                            {
+                                @AltFeatureTemplate(feature);
+                            }
+                        }
+                        else
+                        {
+                            @FeatureTemplate(feature)
+                        }
+                    }
 
 					_i++;
 				}

From 62e6460eddc585d3ea2436ad049585e7237f4c55 Mon Sep 17 00:00:00 2001
From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:02:32 +0200
Subject: [PATCH 5/6] Minor tweaks and fixes

---
 src/Client/Components/App.razor            |  2 +-
 src/Client/Components/DefaultFeature.razor | 11 +++++++++--
 src/Client/Components/Pages/Home.razor     |  2 +-
 src/Client/Components/Template.razor       |  2 +-
 src/Client/Models/CalendarEvent.cs         |  2 +-
 src/Steeltoe-MainSite.sln.DotSettings      |  6 +++++-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Client/Components/App.razor b/src/Client/Components/App.razor
index e15ae68..aff90e2 100644
--- a/src/Client/Components/App.razor
+++ b/src/Client/Components/App.razor
@@ -18,7 +18,7 @@
     <meta property="og:image" content="https://steeltoe.io/images/favicon.png">
     <meta property="og:type" content="website">
     <meta name="DC.Contributor" content="Steeltoe OSS">
-    <meta name="DC.Creator" content="Pivotal Software">
+    <meta name="DC.Creator" content="Broadcom">
     <meta name="DC.Date" content="2019-10-03" scheme="ISO8601">
     <meta name="DC.Format" content="text/html" schema="DCterms:IMT">
     <meta name="DC.Identifier" content="https://steeltoe.io/" schema="DCterms:URI">
diff --git a/src/Client/Components/DefaultFeature.razor b/src/Client/Components/DefaultFeature.razor
index 9c78988..39542cb 100644
--- a/src/Client/Components/DefaultFeature.razor
+++ b/src/Client/Components/DefaultFeature.razor
@@ -1,6 +1,13 @@
 <div class="row component-feature no-gutters">
-    <div class="col-6 text-center"><div class="component-feature-img"><img class="img-fluid" src="@Feature.Img" alt="@Feature.Title" /></div></div>
-    <div class="col"><div class="component-feature-title">@Feature.Title</div><div class="component-feature-desc">@Feature.Description</div></div>
+    <div class="col-6 text-center">
+        <div class="component-feature-img">
+            <img class="img-fluid" src="@Feature.Img" alt="@Feature.Title"/>
+        </div>
+    </div>
+    <div class="col">
+        <div class="component-feature-title">@Feature.Title</div>
+        <div class="component-feature-desc">@Feature.Description</div>
+    </div>
 </div>
 
 @code
diff --git a/src/Client/Components/Pages/Home.razor b/src/Client/Components/Pages/Home.razor
index 1c2e535..be8533c 100644
--- a/src/Client/Components/Pages/Home.razor
+++ b/src/Client/Components/Pages/Home.razor
@@ -105,7 +105,7 @@ else
                     <div class="date">@((MarkupString)calendarEvent.Date)</div>
                     <div class="title">@((MarkupString)calendarEvent.Title)</div>
                     <div class="desc">@((MarkupString)calendarEvent.Description)</div>
-                    <div class=""><a class="special-link" href="@calendarEvent.URL" target="_blank">read more &gt;</a></div>
+                    <div class=""><a class="special-link" href="@calendarEvent.Url" target="_blank">read more &gt;</a></div>
                 </div>
             </div>
         @if (i++ < CalendarEventOptions?.Value.Events.Count)
diff --git a/src/Client/Components/Template.razor b/src/Client/Components/Template.razor
index ddad295..8a82eac 100644
--- a/src/Client/Components/Template.razor
+++ b/src/Client/Components/Template.razor
@@ -94,7 +94,7 @@
                             }
                             else
                             {
-                                @AltFeatureTemplate(feature);
+                                @AltFeatureTemplate(feature)
                             }
                         }
                         else
diff --git a/src/Client/Models/CalendarEvent.cs b/src/Client/Models/CalendarEvent.cs
index 900f356..9d4411c 100644
--- a/src/Client/Models/CalendarEvent.cs
+++ b/src/Client/Models/CalendarEvent.cs
@@ -8,5 +8,5 @@ public class CalendarEvent
 
     public string Description { get; set; }
 
-    public string URL { get; set; }
+    public string Url { get; set; }
 }
diff --git a/src/Steeltoe-MainSite.sln.DotSettings b/src/Steeltoe-MainSite.sln.DotSettings
index 36bb5e5..bb93202 100644
--- a/src/Steeltoe-MainSite.sln.DotSettings
+++ b/src/Steeltoe-MainSite.sln.DotSettings
@@ -1,5 +1,9 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CF/@EntryIndexedValue">CF</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JS/@EntryIndexedValue">JS</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=HashiCorp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PostgreSQL/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Steeltoe/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=VMware/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

From 0cbd60a01e249e898dca5e6d3470f0bce59b75e1 Mon Sep 17 00:00:00 2001
From: Tim Hess <tim.hess@broadcom.com>
Date: Fri, 6 Sep 2024 08:37:57 -0500
Subject: [PATCH 6/6] fix image

---
 src/Client/Components/Pages/Home.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Client/Components/Pages/Home.razor b/src/Client/Components/Pages/Home.razor
index be8533c..7785088 100644
--- a/src/Client/Components/Pages/Home.razor
+++ b/src/Client/Components/Pages/Home.razor
@@ -85,7 +85,7 @@
 </div>
 <div style="margin: 0 0 0 51%;">
     <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" preserveAspectRatio="xMidYMid meet"viewBox="0 0 3517 363">
-        <path fill="#7f9bb6" d="M 0.00,362.00C 0.00,362.00 28.00,363.00 28.00,363.0028.00,363.00 89.00,363.00 89.00,363.0089.00,363.00 301.00,363.00 301.00,363.00301.00,363.00 1026.00,363.00 1026.00,363.001026.00,363.00 3517.00,363.00 3517.00,363.003517.00,363.00 3517.00,0.00 3517.00,0.003517.00,0.00 3495.00,0.00 3495.00,0.003495.00,0.00 3465.00,2.83 3465.00,2.833465.00,2.83 3388.00,10.83 3388.00,10.833388.00,10.83 3205.00,29.83 3205.00,29.833205.00,29.83 2718.00,80.17 2718.00,80.172718.00,80.17 2608.00,91.83 2608.00,91.832608.00,91.83 2319.00,121.83 2319.00,121.832319.00,121.83 1562.00,200.17 1562.00,200.171562.00,200.17 1196.00,238.17 1196.00,238.171196.00,238.17 753.00,284.17 753.00,284.17753.00,284.17 252.00,336.17 252.00,336.17252.00,336.17 79.00,354.17 79.00,354.1779.00,354.17 0.00,362.00 0.00,362.00 Z" />
+        <path fill="#7f9bb6" d="M 0.00,362.00 C 0.00,362.00 28.00,363.00 28.00,363.00 28.00,363.00 89.00,363.00 89.00,363.00 89.00,363.00 301.00,363.00 301.00,363.00 301.00,363.00 1026.00,363.00 1026.00,363.00 1026.00,363.00 3517.00,363.00 3517.00,363.00 3517.00,363.00 3517.00,0.00 3517.00,0.00 3517.00,0.00 3495.00,0.00 3495.00,0.00 3495.00,0.00 3465.00,2.83 3465.00,2.83 3465.00,2.83 3388.00,10.83 3388.00,10.83 3388.00,10.83 3205.00,29.83 3205.00,29.83 3205.00,29.83 2718.00,80.17 2718.00,80.17 2718.00,80.17 2608.00,91.83 2608.00,91.83 2608.00,91.83 2319.00,121.83 2319.00,121.83 2319.00,121.83 1562.00,200.17 1562.00,200.17 1562.00,200.17 1196.00,238.17 1196.00,238.17 1196.00,238.17 753.00,284.17 753.00,284.17 753.00,284.17 252.00,336.17 252.00,336.17 252.00,336.17 79.00,354.17 79.00,354.17 79.00,354.17 0.00,362.00 0.00,362.00 Z" />
     </svg>
 </div>
 <div class="left-yellow-slant bg-midnight-blue text-white width-all pb-4">