diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 42e829a..5952c30 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,6 +3,7 @@ import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
 import { SiteHeader } from "@/components/site-header";
+import { SiteFooter } from "@/components/site-footer";
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -38,6 +39,7 @@ export default function RootLayout({
         >
           <SiteHeader />
           {children}
+          <SiteFooter />
         </ThemeProvider>
       </body>
     </html>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ec8a339..b37c56c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -9,143 +9,123 @@ import { StarterPromptModal } from "@/components/starter-prompt-modal";
 export default function Home() {
   const { isAuthReady, isAiReady, loading } = useDiagnostics();
   return (
-    <div className="min-h-screen flex flex-col grain">
-      <main className="flex-1 container mx-auto px-4 py-12">
-        <div className="max-w-4xl mx-auto text-center space-y-8">
-          <div className="space-y-4">
-            <h2 className="text-4xl font-bold tracking-tight">
-              Welcome to Your Next.js Boilerplate
-            </h2>
-            <p className="text-xl text-muted-foreground">
-              A complete starter kit with authentication, database, AI
-              integration, and modern tooling
-            </p>
-          </div>
-
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mt-12">
-            <div className="p-6 border rounded-lg">
-              <h3 className="font-semibold mb-2">🔐 Authentication</h3>
-              <p className="text-sm text-muted-foreground">
-                Better Auth with Google OAuth integration
-              </p>
-            </div>
-            <div className="p-6 border rounded-lg">
-              <h3 className="font-semibold mb-2">🗄️ Database</h3>
-              <p className="text-sm text-muted-foreground">
-                Drizzle ORM with PostgreSQL setup
-              </p>
-            </div>
-            <div className="p-6 border rounded-lg">
-              <h3 className="font-semibold mb-2">🤖 AI Ready</h3>
-              <p className="text-sm text-muted-foreground">
-                Vercel AI SDK with OpenAI integration
-              </p>
-            </div>
-            <div className="p-6 border rounded-lg">
-              <h3 className="font-semibold mb-2">🎨 UI Components</h3>
-              <p className="text-sm text-muted-foreground">
-                shadcn/ui with Tailwind CSS
-              </p>
-            </div>
-          </div>
-
-          <div className="space-y-6 mt-12">
-            <SetupChecklist />
-
-            <h3 className="text-2xl font-semibold">Next Steps</h3>
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-4 text-left">
-              <div className="p-4 border rounded-lg">
-                <h4 className="font-medium mb-2">
-                  1. Set up environment variables
-                </h4>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Copy <code>.env.example</code> to <code>.env.local</code> and
-                  configure:
-                </p>
-                <ul className="text-sm text-muted-foreground space-y-1 list-disc list-inside">
-                  <li>POSTGRES_URL (PostgreSQL connection string)</li>
-                  <li>GOOGLE_CLIENT_ID (OAuth credentials)</li>
-                  <li>GOOGLE_CLIENT_SECRET (OAuth credentials)</li>
-                  <li>OPENAI_API_KEY (for AI functionality)</li>
-                </ul>
-              </div>
-              <div className="p-4 border rounded-lg">
-                <h4 className="font-medium mb-2">2. Set up your database</h4>
-                <p className="text-sm text-muted-foreground mb-2">
-                  Run database migrations:
-                </p>
-                <div className="space-y-2">
-                  <code className="text-sm bg-muted p-2 rounded block">
-                    npm run db:generate
-                  </code>
-                  <code className="text-sm bg-muted p-2 rounded block">
-                    npm run db:migrate
-                  </code>
-                </div>
-              </div>
-              <div className="p-4 border rounded-lg">
-                <h4 className="font-medium mb-2">3. Try the features</h4>
-                <div className="space-y-2">
-                  {loading || !isAuthReady ? (
-                    <Button size="sm" className="w-full glow" disabled={true}>
-                      View Dashboard
-                    </Button>
-                  ) : (
-                    <Button asChild size="sm" className="w-full glow">
-                      <Link href="/dashboard">View Dashboard</Link>
-                    </Button>
-                  )}
-                  {loading || !isAiReady ? (
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      className="w-full"
-                      disabled={true}
-                    >
-                      Try AI Chat
-                    </Button>
-                  ) : (
-                    <Button
-                      asChild
-                      variant="outline"
-                      size="sm"
-                      className="w-full"
-                    >
-                      <Link href="/chat">Try AI Chat</Link>
-                    </Button>
-                  )}
-                </div>
-              </div>
-              <div className="p-4 border rounded-lg">
-                <h4 className="font-medium mb-2">4. Start building</h4>
-                <p className="text-sm text-muted-foreground mb-3">
-                  Customize the components, add your own pages, and build your
-                  application on top of this solid foundation.
-                </p>
-                <StarterPromptModal />
-              </div>
-            </div>
-          </div>
-        </div>
-      </main>
-
-      <footer className="border-t py-8 text-center text-sm text-muted-foreground">
-        <div className="container mx-auto px-4">
-          <p className="mb-2">Boilerplate template by Leon van Zyl</p>
-          <p>
-            Visit{" "}
-            <a
-              href="https://youtube.com/@leonvanzyl"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="text-primary hover:underline"
-            >
-              @leonvanzyl on YouTube
-            </a>{" "}
-            for tutorials on using this template
+    <main className="flex-1 container mx-auto px-4 py-12">
+      <div className="max-w-4xl mx-auto text-center space-y-8">
+        <div className="space-y-4">
+          <h2 className="text-4xl font-bold tracking-tight">
+            Welcome to Your Next.js Boilerplate
+          </h2>
+          <p className="text-xl text-muted-foreground">
+            A complete starter kit with authentication, database, AI
+            integration, and modern tooling
           </p>
         </div>
-      </footer>
-    </div>
+
+        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mt-12">
+          <div className="p-6 border rounded-lg">
+            <h3 className="font-semibold mb-2">🔐 Authentication</h3>
+            <p className="text-sm text-muted-foreground">
+              Better Auth with Google OAuth integration
+            </p>
+          </div>
+          <div className="p-6 border rounded-lg">
+            <h3 className="font-semibold mb-2">🗄️ Database</h3>
+            <p className="text-sm text-muted-foreground">
+              Drizzle ORM with PostgreSQL setup
+            </p>
+          </div>
+          <div className="p-6 border rounded-lg">
+            <h3 className="font-semibold mb-2">🤖 AI Ready</h3>
+            <p className="text-sm text-muted-foreground">
+              Vercel AI SDK with OpenAI integration
+            </p>
+          </div>
+          <div className="p-6 border rounded-lg">
+            <h3 className="font-semibold mb-2">🎨 UI Components</h3>
+            <p className="text-sm text-muted-foreground">
+              shadcn/ui with Tailwind CSS
+            </p>
+          </div>
+        </div>
+
+        <div className="space-y-6 mt-12">
+          <SetupChecklist />
+
+          <h3 className="text-2xl font-semibold">Next Steps</h3>
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4 text-left">
+            <div className="p-4 border rounded-lg">
+              <h4 className="font-medium mb-2">
+                1. Set up environment variables
+              </h4>
+              <p className="text-sm text-muted-foreground mb-2">
+                Copy <code>.env.example</code> to <code>.env.local</code> and
+                configure:
+              </p>
+              <ul className="text-sm text-muted-foreground space-y-1 list-disc list-inside">
+                <li>POSTGRES_URL (PostgreSQL connection string)</li>
+                <li>GOOGLE_CLIENT_ID (OAuth credentials)</li>
+                <li>GOOGLE_CLIENT_SECRET (OAuth credentials)</li>
+                <li>OPENAI_API_KEY (for AI functionality)</li>
+              </ul>
+            </div>
+            <div className="p-4 border rounded-lg">
+              <h4 className="font-medium mb-2">2. Set up your database</h4>
+              <p className="text-sm text-muted-foreground mb-2">
+                Run database migrations:
+              </p>
+              <div className="space-y-2">
+                <code className="text-sm bg-muted p-2 rounded block">
+                  npm run db:generate
+                </code>
+                <code className="text-sm bg-muted p-2 rounded block">
+                  npm run db:migrate
+                </code>
+              </div>
+            </div>
+            <div className="p-4 border rounded-lg">
+              <h4 className="font-medium mb-2">3. Try the features</h4>
+              <div className="space-y-2">
+                {loading || !isAuthReady ? (
+                  <Button size="sm" className="w-full glow" disabled={true}>
+                    View Dashboard
+                  </Button>
+                ) : (
+                  <Button asChild size="sm" className="w-full glow">
+                    <Link href="/dashboard">View Dashboard</Link>
+                  </Button>
+                )}
+                {loading || !isAiReady ? (
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    className="w-full"
+                    disabled={true}
+                  >
+                    Try AI Chat
+                  </Button>
+                ) : (
+                  <Button
+                    asChild
+                    variant="outline"
+                    size="sm"
+                    className="w-full"
+                  >
+                    <Link href="/chat">Try AI Chat</Link>
+                  </Button>
+                )}
+              </div>
+            </div>
+            <div className="p-4 border rounded-lg">
+              <h4 className="font-medium mb-2">4. Start building</h4>
+              <p className="text-sm text-muted-foreground mb-3">
+                Customize the components, add your own pages, and build your
+                application on top of this solid foundation.
+              </p>
+              <StarterPromptModal />
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
   );
 }
diff --git a/src/components/site-footer.tsx b/src/components/site-footer.tsx
new file mode 100644
index 0000000..09d852d
--- /dev/null
+++ b/src/components/site-footer.tsx
@@ -0,0 +1,24 @@
+import { GitHubStars } from "./ui/github-stars";
+
+export function SiteFooter() {
+  return (
+    <footer className="border-t py-6 text-center text-sm text-muted-foreground">
+      <div className="container mx-auto px-4">
+        <div className="flex flex-col items-center space-y-3">
+          <GitHubStars repo="leonvanzyl/nextjs-better-auth-postgresql-starter-kit" />
+          <p>
+            Built using Boilerplate Template by{" "}
+            <a
+              href="https://youtube.com/@leonvanzyl"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-primary hover:underline"
+            >
+              Leon van Zyl
+            </a>
+          </p>
+        </div>
+      </div>
+    </footer>
+  );
+}
diff --git a/src/components/site-header.tsx b/src/components/site-header.tsx
index d1b1d65..927fe03 100644
--- a/src/components/site-header.tsx
+++ b/src/components/site-header.tsx
@@ -1,7 +1,6 @@
 import Link from "next/link";
 import { UserProfile } from "@/components/auth/user-profile";
 import { ModeToggle } from "./ui/mode-toggle";
-import { GitHubStars } from "./ui/github-stars";
 
 export function SiteHeader() {
   return (
@@ -17,7 +16,6 @@ export function SiteHeader() {
         </h1>
         <div className="flex items-center gap-4">
           <UserProfile />
-          <GitHubStars repo="leonvanzyl/nextjs-better-auth-postgresql-starter-kit" />
           <ModeToggle />
         </div>
       </div>