diff --git a/TODO b/TODO
index 6c4ee6b..2587734 100644
--- a/TODO
+++ b/TODO
@@ -11,4 +11,6 @@
 - try/catch where needed in client code
 - generate state and check it against the state returned from lichess https://lichess.org/api#tag/oauth/GET/oauth
 - checkbox and toggle disabled states
-- 404
\ No newline at end of file
+- 404 page
+- lichess data with zod validation
+- react query on for study and chapter load, to allow caching
\ No newline at end of file
diff --git a/src/components/Error/GenericErrorView.tsx b/src/components/GenericErrorView.tsx
similarity index 100%
rename from src/components/Error/GenericErrorView.tsx
rename to src/components/GenericErrorView.tsx
diff --git a/src/components/LoadingView.tsx b/src/components/LoadingView.tsx
new file mode 100644
index 0000000..c857f28
--- /dev/null
+++ b/src/components/LoadingView.tsx
@@ -0,0 +1,34 @@
+interface IProps {
+	title?: string;
+	description?: string;
+}
+
+const LoadingView = ({ title, description }: IProps) => {
+	return (
+		<div className="flex min-h-[calc(100vh-194px)] flex-col items-center justify-center p-6 bg-base-100">
+			<div className="relative flex max-w-sm flex-col items-center text-center">
+				{/* Animated Custom Loader */}
+				<div className="relative mb-6 flex h-16 w-16 items-center justify-center">
+					{/* Outer Pulsing Ring */}
+					<div className="absolute inset-0 animate-ping rounded-full bg-(--accent) opacity-20 [animation-duration:1.5s]"></div>
+
+					{/* Inner Spinning Ring */}
+					<div className="h-12 w-12 animate-spin rounded-full border-4 border-(--accent) border-t-transparent"></div>
+				</div>
+
+				{/* Loading Content */}
+				<h2 className="text-xl font-bold tracking-tight mb-2 text-(--base-content)">
+					{title || "Loading Data"}
+				</h2>
+				<p className="text-sm text-(--neutral-content) max-w-xs">
+					{description || "Please wait a moment while we load the data."}
+				</p>
+
+				{/* Decorative background glow matching your layout */}
+				<div className="absolute -inset-10 -z-10 bg-(--accent)/5 blur-2xl rounded-full pointer-events-none" />
+			</div>
+		</div>
+	);
+};
+
+export default LoadingView;
diff --git a/src/pages/Callback.tsx b/src/pages/Callback.tsx
index 3ba34be..0aecbdf 100644
--- a/src/pages/Callback.tsx
+++ b/src/pages/Callback.tsx
@@ -1,4 +1,6 @@
 import { getRouteApi, useNavigate } from "@tanstack/react-router";
+import GenericErrorView from "#/components/GenericErrorView.tsx";
+import LoadingView from "#/components/LoadingView.tsx";
 import { useLichess } from "#/hooks/useLichess.ts";
 
 const routeApi = getRouteApi("/callback");
@@ -11,11 +13,11 @@ const Callback = () => {
 
 	if (status === "success") navigate({ to: "/chessboard" });
 
-	if (status === "error") {
-		console.error(error);
-	}
+	if (status === "error") return <GenericErrorView error={error} />;
 
-	return <div>Loading...</div>;
+	return (
+		<LoadingView title="Logging in..." description="Please wait a moment..." />
+	);
 };
 
 export default Callback;
diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx
index f0baf99..66dc5d2 100644
--- a/src/routes/__root.tsx
+++ b/src/routes/__root.tsx
@@ -3,7 +3,8 @@ import { createRootRoute, HeadContent, Scripts } from "@tanstack/react-router";
 import { TanStackRouterDevtoolsPanel } from "@tanstack/react-router-devtools";
 import { type ReactNode, Suspense } from "react";
 import { ToastContainer } from "react-toastify";
-import GenericErrorView from "#/components/Error/GenericErrorView.tsx";
+import GenericErrorView from "#/components/GenericErrorView.tsx";
+import LoadingView from "#/components/LoadingView.tsx";
 import { MatomoAnalytics } from "#/components/MatomoAnalytics.tsx";
 import { LichessUserProvider } from "#/context/LichessUserContext.tsx";
 import Footer from "../components/Footer";
@@ -45,6 +46,7 @@ export const Route = createRootRoute({
 	}),
 	shellComponent: RootDocument,
 	errorComponent: ({ error }) => <GenericErrorView error={error} />,
+	pendingComponent: () => <LoadingView />,
 });
 
 function RootDocument({ children }: { children: ReactNode }) {
diff --git a/src/routes/callback.tsx b/src/routes/callback.tsx
index 2af503a..a8b026e 100644
--- a/src/routes/callback.tsx
+++ b/src/routes/callback.tsx
@@ -1,6 +1,6 @@
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { z } from "zod";
-import GenericErrorView from "#/components/Error/GenericErrorView.tsx";
+import GenericErrorView from "#/components/GenericErrorView.tsx";
 import Callback from "#/pages/Callback.tsx";
 
 const callbackSchema = z.object({