diff --git a/BeauFindlay/src/BeauFindlay.Client/Components/Anchor/Anchor.razor b/BeauFindlay/src/BeauFindlay.Client/Components/Anchor/Anchor.razor
new file mode 100644
index 0000000..af28abc
--- /dev/null
+++ b/BeauFindlay/src/BeauFindlay.Client/Components/Anchor/Anchor.razor
@@ -0,0 +1,18 @@
+<a href="@Href"
+   target="@Target"
+   class="underline underline-offset-2">
+   @ChildContent
+</a>
+
+@code {
+
+    [Parameter]
+    public string Href { get; set; } = string.Empty;
+
+    [Parameter]
+    public string Target { get; set; } = "_blank";
+    
+    [Parameter]
+    public RenderFragment? ChildContent { get; set; }
+
+}
\ No newline at end of file
diff --git a/BeauFindlay/src/BeauFindlay.Client/Layout/Footer.razor b/BeauFindlay/src/BeauFindlay.Client/Layout/Footer.razor
index da00afd..23549bc 100644
--- a/BeauFindlay/src/BeauFindlay.Client/Layout/Footer.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/Layout/Footer.razor
@@ -1,4 +1,4 @@
-<footer class="mt-auto fade-in">
+<footer class="mt-auto">
     <div class="mx-auto py-8 px-4 md:px-12">
         <div class="md:flex md:items-center md:justify-between">
             <div class="flex space-x-6 md:order-2">
diff --git a/BeauFindlay/src/BeauFindlay.Client/Layout/MainLayout.razor b/BeauFindlay/src/BeauFindlay.Client/Layout/MainLayout.razor
index 5574a1f..9a486ee 100644
--- a/BeauFindlay/src/BeauFindlay.Client/Layout/MainLayout.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/Layout/MainLayout.razor
@@ -1,6 +1,6 @@
 @inherits LayoutComponentBase
 
-<div class="flex flex-col min-h-screen">
+<div class="flex flex-col min-h-screen fade-in">
     <NavBar/>
     
     <div class="px-4 md:px-12 py-4">
diff --git a/BeauFindlay/src/BeauFindlay.Client/Layout/NavBar.razor b/BeauFindlay/src/BeauFindlay.Client/Layout/NavBar.razor
index f6684b3..74d932b 100644
--- a/BeauFindlay/src/BeauFindlay.Client/Layout/NavBar.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/Layout/NavBar.razor
@@ -1,4 +1,4 @@
-<nav class="flex items-center justify-center py-12 space-x-8 fade-in">
+<nav class="flex items-center justify-center py-12 space-x-8">
     <NavLink href="/" Match="NavLinkMatch.All" ActiveClass="border-l-2 border-r-2 px-2 rounded">
         Home
     </NavLink>
diff --git a/BeauFindlay/src/BeauFindlay.Client/Pages/About.razor b/BeauFindlay/src/BeauFindlay.Client/Pages/About.razor
index 9ad5f4d..c71ccbd 100644
--- a/BeauFindlay/src/BeauFindlay.Client/Pages/About.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/Pages/About.razor
@@ -13,16 +13,16 @@ else
     <h1 class="text-4xl">This app<span class="blinking-cursor">|</span></h1>
 }
 
-<p class="py-4 text-xl">Below is a brief outline of how this app is made and what technologies are used. If you'd like to dive straight in then full project is available on my <a href="https://github.com/bdfin/my-portfolio" target="_blank" class="underline underline-offset-2">GitHub</a>.</p>
+<p class="py-4 text-xl">Below is a brief outline of how this app is made and what technologies are used. If you'd like to dive straight in then full project is available on my <Anchor Href="https://github.com/bdfin/my-portfolio">GitHub</Anchor>.</p>
 
 <section class="py-6" id="@FrontEndSection">
     <h2 class="text-2xl">Front-end</h2>
     
-    <p class="py-4">I wanted to create a decent, modern client-side experience for this app and given my <em class="text-xs">(very...)</em> limited front-end expertise I decided to choose <a href="https://dotnet.microsoft.com/en-us/apps/aspnet/web-apps/blazor" target="_blank" class="underline underline-offset-2">.NET Blazor Webassembly</a>. Blazor is Microsoft's take on component-based SPAs (single page applications) and offers us back-end focussed devs a way of producing decent client experiences without needing to dive into another front-end specific technology.</p>
+    <p class="py-4">I wanted to create a decent, modern client-side experience for this app and given my <em class="text-xs">(very...)</em> limited front-end expertise I decided to choose <Anchor Href="https://dotnet.microsoft.com/en-us/apps/aspnet/web-apps/blazor">.NET Blazor Webassembly</Anchor>. Blazor is Microsoft's take on component-based SPAs (single page applications) and offers us back-end focussed devs a way of producing decent client experiences without needing to dive into another front-end specific technology.</p>
     
-    <p class="py-4">Blazor traditionally came in two flavours, server and webassembly with an additional third option (Blazor Web App) recently released with .NET 8 which is an amalgamation of both. <a href="https://learn.microsoft.com/en-us/aspnet/core/blazor/hosting-models?view=aspnetcore-8.0#blazor-server" target="_blank" class="underline underline-offset-2">Blazor Server</a> initially generates content on the server and utilises web-sockets to communicate dynamic UI updates with the client without requiring a page load, whereas <a href="https://learn.microsoft.com/en-us/aspnet/core/blazor/hosting-models?view=aspnetcore-8.0#blazor-webassembly" target="_blank" class="underline underline-offset-2">Blazor Webassembly</a> downloads the entire app to the client browser on first load alongside a light-weight .NET run-time to execute code directly on the browsers UI thread.</p>
+    <p class="py-4">Blazor traditionally came in two flavours, server and webassembly with an additional third option (Blazor Web App) recently released with .NET 8 which is an amalgamation of both. <Anchor Href="https://learn.microsoft.com/en-us/aspnet/core/blazor/hosting-models?view=aspnetcore-8.0#blazor-server">Blazor Server</Anchor> initially generates content on the server and utilises web-sockets to communicate dynamic UI updates with the client without requiring a page load, whereas <Anchor Href="https://learn.microsoft.com/en-us/aspnet/core/blazor/hosting-models?view=aspnetcore-8.0#blazor-webassembly">Blazor Webassembly</Anchor> downloads the entire app to the client browser on first load alongside a light-weight .NET run-time to execute code directly on the browsers UI thread.</p>
     
-    <p class="py-4">As Blazor server requires a dedicated server to host the application, I chose Blazor webassembly to enable me to host this app for free using an <a href="https://azure.microsoft.com/en-gb/products/app-service/static" target="_blank" class="underline underline-offset-2">Azure Static Web App</a>. You can read more about this in the <a @onclick="() => ScrollToElementAsync(HostingSection)" class="underline underline-offset-2 cursor-pointer">hosting</a> section.</p>
+    <p class="py-4">As Blazor server requires a dedicated server to host the application, I chose Blazor webassembly to enable me to host this app for free using an <Anchor Href="https://azure.microsoft.com/en-gb/products/app-service/static">Azure Static Web App</Anchor>. You can read more about this in the <a @onclick="() => ScrollToElementAsync(HostingSection)" class="underline underline-offset-2 cursor-pointer">hosting</a> section.</p>
 </section>
 
 <section class="py-6" id="@BackEndSection">
diff --git a/BeauFindlay/src/BeauFindlay.Client/Pages/Contact.razor b/BeauFindlay/src/BeauFindlay.Client/Pages/Contact.razor
index 9ed2d5f..a40cf8b 100644
--- a/BeauFindlay/src/BeauFindlay.Client/Pages/Contact.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/Pages/Contact.razor
@@ -1,5 +1,4 @@
 @page "/contact"
-@using BeauFindlay.Shared.Contracts
 
 @inject HttpClient HttpClient
 @inject IJSRuntime JSRuntime
@@ -40,7 +39,7 @@
             </div>
         </div>
         <div class="mt-4">
-            <small>This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy" class="underline underline-offset-2">Privacy Policy</a> and <a href="https://policies.google.com/terms" class="underline underline-offset-2">Terms of Service</a> apply.</small>
+            <small>This site is protected by reCAPTCHA and the Google <Anchor Href="https://policies.google.com/privacy" Target="_blank">Privacy Policy</Anchor> and <Anchor Href="https://policies.google.com/terms" Target="_blank">Terms of Service</Anchor> apply.</small>
         </div>
         <div class="mt-4 flex items-center justify-center">
             <Button Type="submit" IsLoading="@isSubmitting">
diff --git a/BeauFindlay/src/BeauFindlay.Client/Pages/Home.razor b/BeauFindlay/src/BeauFindlay.Client/Pages/Home.razor
index e9418a5..85371db 100644
--- a/BeauFindlay/src/BeauFindlay.Client/Pages/Home.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/Pages/Home.razor
@@ -25,12 +25,12 @@
     </p>
 
     <p class="text-xl mt-4">
-        <Typewriter Text="I'm currently heading up the tech as CTO at a cool startup called un:hurd."/>
+        <Typewriter Text="I've worked with businesses at all sizes and stages and I'm currently heading up the tech as CTO at a cool startup called un:hurd."/>
     </p>
 }
 else
 {
-    <h1 class="text-4xl">Hi, I'm Beau.<span class="blinking-cursor">|</span></h1>
+    <h1 class="text-4xl">Hi, I'm Beau.</h1>
 
     <p class="text-xl mt-4">I'm a UK-based software engineer and I love building cool stuff.</p>
 
@@ -38,7 +38,7 @@ else
 
     <p class="text-xl mt-4">I mostly specialise in back-end C#/.NET development and I've built systems that scale for hundreds-of-thousands of global users.</p>
 
-    <p class="text-xl mt-4">I'm currently heading up the tech as CTO at a cool startup called <a href="https://unhurd.co.uk" target="_blank" class="underline">un:hurd</a>.</p>
+    <p class="text-xl mt-4">I've worked with businesses at all sizes and stages and I'm currently heading up the tech as CTO at a cool startup called <Anchor Href="https://unhurd.co.uk">un:hurd</Anchor>.</p>
 }
 
 
diff --git a/BeauFindlay/src/BeauFindlay.Client/_Imports.razor b/BeauFindlay/src/BeauFindlay.Client/_Imports.razor
index aaeab63..f279519 100644
--- a/BeauFindlay/src/BeauFindlay.Client/_Imports.razor
+++ b/BeauFindlay/src/BeauFindlay.Client/_Imports.razor
@@ -10,6 +10,7 @@
 @using BeauFindlay.Client
 @using BeauFindlay.Client.Layout
 @using BeauFindlay.Client.Components.Alert
+@using BeauFindlay.Client.Components.Anchor
 @using BeauFindlay.Client.Components.Typewriter
 @using BeauFindlay.Client.Components.Button
 @using BeauFindlay.Client.Components.LoadingSpinner
diff --git a/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.css b/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.css
index 2e4bccb..e93f0ec 100644
--- a/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.css
+++ b/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.css
@@ -12,7 +12,7 @@
 }
 
 .fade-in {
-    animation: fadeInAnimation ease 6s;
+    animation: fadeInAnimation ease 3s;
     animation-iteration-count: 1;
     animation-fill-mode: forwards;
 }
diff --git a/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.min.css b/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.min.css
index 59cb078..562a466 100644
--- a/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.min.css
+++ b/BeauFindlay/src/BeauFindlay.Client/wwwroot/css/app.min.css
@@ -965,7 +965,7 @@ video {
 }
 
 .fade-in {
-  animation: fadeInAnimation ease 6s;
+  animation: fadeInAnimation ease 3s;
   animation-iteration-count: 1;
   animation-fill-mode: forwards;
 }