diff --git a/src/lib/islands/overlay-island.svelte b/src/lib/islands/overlay-island.svelte
index 3b688fe..34a7c63 100644
--- a/src/lib/islands/overlay-island.svelte
+++ b/src/lib/islands/overlay-island.svelte
@@ -1,8 +1,10 @@
 <script>
+	import { fade } from "svelte/transition";
+
     export let variables = {title:""}
 </script>
 
-<div>
+<div in:fade={{duration: 150}} out:fade={{duration: 150}}>
     <span>{variables.title}</span>
     <slot />
 </div>
diff --git a/src/lib/navigation/header.svelte b/src/lib/navigation/header.svelte
index 0abb7d2..9a80d8d 100644
--- a/src/lib/navigation/header.svelte
+++ b/src/lib/navigation/header.svelte
@@ -1,4 +1,6 @@
 <script>
+	import { fade } from "svelte/transition";
+
     export let title = 'title'
 </script>
 
@@ -9,7 +11,7 @@
           <img src="/images/logo/wide_logo_200.png" alt="OwlBoard Logo">
         </picture>
     </a>
-    <header>{title}</header>
+    <header in:fade={{duration: 150}} out:fade={{duration: 150}}>{title}</header>
 </div>
 <div class="headerBlock">
  <!-- This exists to prevent the headerBar overlapping anything below it -->
diff --git a/src/lib/navigation/loading.svelte b/src/lib/navigation/loading.svelte
index 184189d..8e575af 100644
--- a/src/lib/navigation/loading.svelte
+++ b/src/lib/navigation/loading.svelte
@@ -1,4 +1,8 @@
-<div id="container">
+<script>
+    import { fade } from "svelte/transition";
+</script>
+
+<div id="container" in:fade={{delay: 150, duration: 250}} out:fade={{duration: 250}}>
     <div class="spinner"></div>
     <p>Loading...</p>
 </div>
diff --git a/src/routes/more/corpus/+page.svelte b/src/routes/more/corpus/+page.svelte
index 40689c2..f58c1fa 100644
--- a/src/routes/more/corpus/+page.svelte
+++ b/src/routes/more/corpus/+page.svelte
@@ -1,5 +1,6 @@
 <script>
     import Header from '$lib/navigation/header.svelte'
+	import Loading from '$lib/navigation/loading.svelte';
     import Nav from '$lib/navigation/nav.svelte'
     const title = "Location Codes"   
 
@@ -12,10 +13,13 @@
         uic: ""
     }
 
+    let isLoading = false;
+
     async function getData(type = "", value = "") {
         const url = `https://owlboard.info/api/v2/ref/locationCode/${type}/${value}`
         const res = await fetch(url);
         const data = await res.json();
+        isLoading = false;
         return data;
     }
 
@@ -36,6 +40,7 @@
     }
 
     async function submit() {
+        isLoading = true;
         let data = [];
         if (val?.crs) {
             data = await getData("crs", val.crs);
@@ -65,6 +70,10 @@
 </script>
  
 <Header {title} />
+
+{#if isLoading}
+  <Loading />
+{/if}
  
 <p>Enter one of the codes below and press submit.</p>
 <p>OwlBoard doesn't currently support searching by name or UIC.</p>
diff --git a/src/routes/more/data/+page.svelte b/src/routes/more/data/+page.svelte
index ab16575..fc1c05f 100644
--- a/src/routes/more/data/+page.svelte
+++ b/src/routes/more/data/+page.svelte
@@ -1,5 +1,6 @@
 <script>
     import Header from '$lib/navigation/header.svelte';
+	import Loading from '$lib/navigation/loading.svelte';
     import Nav from '$lib/navigation/nav.svelte';
     import { uuid } from '$lib/stores/uuid.js';
     import { onMount } from 'svelte';
@@ -12,6 +13,8 @@
         }
     ]
 
+    let isLoading = false;
+
     async function fetchData() {
         if ($uuid != "null") {
             const url = `https://owlboard.info/api/v2/user/${$uuid}`
@@ -24,7 +27,9 @@
     }
 
     onMount(async () => {
-        fetchData();
+        isLoading = true;
+        await fetchData();
+        isLoading = false;
     })
 </script>
  
@@ -34,13 +39,17 @@
 <p>Besides your randomly generated UUID which is used to authorise your staff access we store the following data:</p>
 <br><br>
 
-{#if data[0].domain != "User not Found"}
-  <p class="api_response">Registration Domain: {data[0]['domain']}</p>
-  <p class="api_response">Access Time: {data[0]['atime']}</p>
+{#if isLoading}
+  <Loading />
 {:else}
-  <p class="api_response">You are not registered, we don't have any data stored.</p>
+  {#if data[0].domain != "User not Found"}
+    <p class="api_response">Registration Domain: {data[0]['domain']}</p>
+    <p class="api_response">Access Time: {data[0]['atime']}</p>
+  {:else}
+    <p class="api_response">You are not registered, we don't have any data stored.</p>
+  {/if}
 {/if}
- 
+  
 <Nav />
 
 <style>