diff --git a/src/lib/components/ui/Loading.svelte b/src/lib/components/ui/Loading.svelte
new file mode 100644
index 0000000..a16cb73
--- /dev/null
+++ b/src/lib/components/ui/Loading.svelte
@@ -0,0 +1,59 @@
+<script lang="ts">
+    let {
+        message = "Loading..."
+    } = $props();
+</script>
+
+<div class="loading-state">
+    <div class="track">
+        <div class="shuttle"></div>
+    </div>
+    <p>{message}</p>
+</div>
+
+<style>
+    .loading-state {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding: 4rem 2rem;
+        width: 75%;
+        margin: auto;
+    }
+
+    .track {
+        width: 160px;
+        height: 3px;
+        background-color: var(--color-title);
+        border-radius: 4px;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .shuttle {
+        position: absolute;
+        width: 50%;
+        height: 100%;
+        border-radius: 4px;
+        background: linear-gradient(90deg, #1abc9c 0%, #3498db 100%);
+        animation: data-travel 1.6s infinite ease-in-out;
+    }
+
+    p {
+        font-family: 'URW Gothic', sans-serif;
+        letter-spacing: 0.15em;
+        color: var(--color-title);
+        animation: pulse 2s infinite ease-in-out;
+    }
+
+    @keyframes data-travel {
+        0% { left: -50%; }
+        100% { left: 100%; }
+    }
+
+    @keyframes pulse {
+        0%, 100% {opacity: 1;}
+        50% {opacity: 0.4;}
+    }
+</style>
\ No newline at end of file
diff --git a/src/lib/components/ui/TocStyle.svelte b/src/lib/components/ui/TocStyle.svelte
index f6eaf66..c390afc 100644
--- a/src/lib/components/ui/TocStyle.svelte
+++ b/src/lib/components/ui/TocStyle.svelte
@@ -22,8 +22,22 @@
 		justify-content: center;
 		padding: 2px 8px;
 		font-weight: 800;
+		font-size: 1.1rem;
 		background-color: #333;
 		color: #fff;
+		font-family:'Courier New', Courier, monospace;
+	}
+
+	.AW {
+		/* Transport for Wales */
+		background: red;
+		color: white;
+	}
+
+	.LM {
+		/* West Midlands Trains */
+		background: rgb(176, 115, 1);
+		color: white;
 	}
 
 	.GW {
@@ -44,6 +58,12 @@
 		color: #ffffff;
 	}
 
+	.GN {
+		/* Great Northern */
+		background-color: fuchsia;
+		color: rgb(229, 229, 229);
+	}
+
 	.SW {
 		/* South Western Railway */
 		background-color: #2a3389;
diff --git a/src/lib/components/ui/TrainService.svelte b/src/lib/components/ui/TrainService.svelte
index cd7a44e..de2fb8e 100644
--- a/src/lib/components/ui/TrainService.svelte
+++ b/src/lib/components/ui/TrainService.svelte
@@ -30,6 +30,7 @@ import { formatUkTime } from '$lib/utils/time';
         <div class="location-summary">
             {service.dt}    
         </div>
+        <!-- Add arrow icon to signify drop-down -->
     </div>
     </button>
 </div>
@@ -42,6 +43,12 @@ import { formatUkTime } from '$lib/utils/time';
         box-shadow: var(--shadow-std);
         overflow: hidden;
         font-family: 'URW Gothic', sans-serif;
+        transition: 0.2s all;
+        filter: brightness(1.1);
+    }
+
+    .train-service:hover {
+        filter:brightness(1.5);
     }
 
     .summary {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 6be2492..ced6422 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,10 +2,11 @@
 	import { page } from '$app/state';
 	import { slide, fade } from 'svelte/transition';
 	import { onMount } from 'svelte';
-
+	import { navigating } from '$app/state';
 	import { LOCATIONS } from '$lib/locations-object.svelte';
 	import { nearestStationsState } from '$lib/geohash.svelte';
 
+	import Loading from '$lib/components/ui/Loading.svelte';
 	import TimezoneWarning from '$lib/components/ui/TimezoneWarning.svelte';
 
 	import '$lib/global.css';
@@ -81,7 +82,12 @@
 
 <main>
 	<TimezoneWarning />
-	{@render children()}
+
+	{#if navigating && navigating.to}
+		<Loading />
+	{:else}
+		{@render children()}
+	{/if}
 </main>
 
 <nav bind:clientWidth={navWidth}>
diff --git a/src/routes/trains/+page.svelte b/src/routes/trains/+page.svelte
index 84cb308..481058c 100644
--- a/src/routes/trains/+page.svelte
+++ b/src/routes/trains/+page.svelte
@@ -2,8 +2,11 @@
     import NoResults from '$lib/components/ui/NoResults.svelte';
 	import TrainService from '$lib/components/ui/TrainService.svelte';
     let { data } = $props();
+
 </script>
 
+
+
 {#if data.results.length === 0}
     <NoResults 
         message={"No trains found on this date with this headcode."}