diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 834dccd..2039b18 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -3,9 +3,11 @@
 	import { PUBLIC_MIX_TOKEN } from '$env/static/public'
 	import '$lib/app.css'
 	import '@fontsource/jost'
+	import { navigating } from '$app/stores'
+	import Loader from '$lib/elements/Loader.svelte'
+	import mixpanel from 'mixpanel-browser'
 
 	//Import Mixpanel SDK
-	import mixpanel from 'mixpanel-browser'
 	mixpanel.init(PUBLIC_MIX_TOKEN, {
 		debug: false,
 		track_pageview: true,
@@ -14,27 +16,36 @@
 </script>
 
 <main class="h-[100svh] flex flex-col">
-	<nav>
-		<div class="flex justify-center py-2">
-			<p class="text-center text-2xl text-red-600 font-semibold">Molla Printing & Packaging</p>
+	{#if $navigating}
+		<div class="flex h-full w-full items-center justify-center">
+			<Loader />
 		</div>
-		<div
-			class="w-full max-w-6xl mx-auto bg-gradient-to-r from-transparent via-orange-800/40 to-transparent p-[1px]"
-		/>
-		<div class="px-4 flex w-full mt-2">
-			<div class="flex w-full flex-row justify-end gap-3 py-1 px-2 rounded border border-teal-400">
-				<a href="/history" class:hidden={$page.url.pathname == '/history'} class="h-full">History</a
+	{:else}
+		<nav>
+			<div class="flex justify-center py-2">
+				<p class="text-center text-2xl text-red-600 font-semibold">Molla Printing & Packaging</p>
+			</div>
+			<div
+				class="w-full max-w-6xl mx-auto bg-gradient-to-r from-transparent via-orange-800/40 to-transparent p-[1px]"
+			/>
+			<div class="px-4 flex w-full mt-2">
+				<div
+					class="flex w-full flex-row justify-end gap-3 py-1 px-2 rounded border border-teal-400"
 				>
-				<a href="/" class:!block={$page.url.pathname == '/history'} class="hidden h-full">Home</a>
+					<a href="/history" class:hidden={$page.url.pathname == '/history'} class="h-full"
+						>History</a
+					>
+					<a href="/" class:!block={$page.url.pathname == '/history'} class="hidden h-full">Home</a>
+				</div>
 			</div>
-		</div>
-	</nav>
-	<slot />
+		</nav>
+		<slot />
 
-	<div class="absolute bottom-0 w-full">
-		<p class="text-center text-gray-400">
-			&#x1F4BB;Developed by <a href="https://github.com/prokawsar" target="_blank">ProKawsar</a
-			>&#x1F60E;
-		</p>
-	</div>
+		<div class="absolute bottom-0 w-full">
+			<p class="text-center text-gray-400">
+				&#x1F4BB;Developed by <a href="https://github.com/prokawsar" target="_blank">ProKawsar</a
+				>&#x1F60E;
+			</p>
+		</div>
+	{/if}
 </main>