diff --git a/src/public/staticwebapp.config.json b/src/public/staticwebapp.config.json
new file mode 100644
index 0000000..c4e8259
--- /dev/null
+++ b/src/public/staticwebapp.config.json
@@ -0,0 +1,16 @@
+{
+  "navigationFallback": {
+    "rewrite": "/404.html",
+    "exclude": [
+      "/images/*.{png,jpg,gif,svg,ico,webp}",
+      "/_next/*",
+      "/favicon.ico"
+    ]
+  },
+  "responseOverrides": {
+    "404": {
+      "rewrite": "/404.html",
+      "statusCode": 404
+    }
+  }
+}
diff --git a/src/src/app/error.tsx b/src/src/app/error.tsx
new file mode 100644
index 0000000..33d9667
--- /dev/null
+++ b/src/src/app/error.tsx
@@ -0,0 +1,45 @@
+"use client";
+
+import { useEffect } from "react";
+import { useRouter } from "next/navigation";
+import ErrorMessage from "@/components/shared/ErrorMessage";
+
+export default function GlobalError({
+    error,
+    reset,
+}: {
+    error: Error & { digest?: string };
+    reset: () => void;
+}) {
+    const router = useRouter();
+
+    useEffect(() => {
+        // Log errors in development for debugging
+        if (process.env.NODE_ENV === "development") {
+            console.error(error);
+        }
+    }, [error]);
+
+    return (
+        <ErrorMessage
+            title="Oops!"
+            heading="Something went wrong"
+            message="An unexpected error has occurred. Please try again or return to the home page."
+        >
+            <div className="flex gap-4">
+                <button
+                    onClick={() => reset()}
+                    className="px-6 py-3 bg-primary text-text-inverse font-medium rounded-lg hover:bg-primary-hover transition-colors duration-200"
+                >
+                    Try Again
+                </button>
+                <button
+                    onClick={() => router.push("/")}
+                    className="px-6 py-3 bg-surface-hover text-text-primary font-medium rounded-lg border border-border hover:bg-surface-elevated transition-colors duration-200"
+                >
+                    Back to Home
+                </button>
+            </div>
+        </ErrorMessage>
+    );
+}
diff --git a/src/src/app/not-found.tsx b/src/src/app/not-found.tsx
new file mode 100644
index 0000000..e8302c4
--- /dev/null
+++ b/src/src/app/not-found.tsx
@@ -0,0 +1,19 @@
+import Link from "next/link";
+import ErrorMessage from "@/components/shared/ErrorMessage";
+
+export default function NotFound() {
+    return (
+        <ErrorMessage
+            title="404"
+            heading="Page Not Found"
+            message="Sorry, the page you are looking for does not exist or has been moved."
+        >
+            <Link 
+                href="/"
+                className="px-6 py-3 bg-primary text-text-inverse font-medium rounded-lg hover:bg-primary-hover transition-colors duration-200"
+            >
+                Back to Home
+            </Link>
+        </ErrorMessage>
+    );
+}
diff --git a/src/src/components/shared/ErrorMessage.tsx b/src/src/components/shared/ErrorMessage.tsx
new file mode 100644
index 0000000..7685fa4
--- /dev/null
+++ b/src/src/components/shared/ErrorMessage.tsx
@@ -0,0 +1,28 @@
+"use client";
+
+import { ReactNode } from "react";
+import { typographyStyles } from "@/components/shared/typography/core/styles";
+
+interface ErrorMessageProps {
+    title: string;
+    heading: string;
+    message: string;
+    children?: ReactNode;
+}
+
+export default function ErrorMessage({ title, heading, message, children }: ErrorMessageProps) {
+    return (
+        <section className="flex flex-col items-center justify-center min-h-[60vh] text-center px-4">
+            <h1 className={`${typographyStyles.heading1} text-6xl md:text-8xl mb-4`}>
+                {title}
+            </h1>
+            <h2 className={`${typographyStyles.heading2} mb-6`}>
+                {heading}
+            </h2>
+            <p className={`${typographyStyles.text} mb-8 max-w-md`}>
+                {message}
+            </p>
+            {children}
+        </section>
+    );
+}