diff --git a/apps/web/app/(auth)/signin/page.tsx b/apps/web/app/(auth)/signin/page.tsx
index 3b563b90..c7cceec5 100644
--- a/apps/web/app/(auth)/signin/page.tsx
+++ b/apps/web/app/(auth)/signin/page.tsx
@@ -1,26 +1,14 @@
 import Image from "next/image";
 import Link from "next/link";
 import Logo from "@/public/logo.svg";
-import { auth, signIn } from "@/server/auth";
+import { signIn } from "@/server/auth";
 import { Google } from "@repo/ui/components/icons";
 import gradientStyle from "./_components/TextGradient/gradient.module.css";
 import { cn } from "@repo/ui/lib/utils";
-import { redirect } from "next/navigation";
-import { toast } from "sonner";
 
 export const runtime = "edge";
 
-async function Signin({
-	searchParams,
-}: {
-	searchParams: Record<string, string>;
-}) {
-	const user = await auth();
-
-	if (user) {
-		redirect("/home");
-	}
-
+async function Signin() {
 	return (
 		<div className="flex relative font-geistSans overflow-hidden items-center justify-between min-h-screen">
 			<div className="relative w-full lg:w-1/2 flex items-center min-h-screen bg-page-gradient  p-8 border-r-[1px] border-white/5">
diff --git a/apps/web/app/(dash)/(memories)/content.tsx b/apps/web/app/(dash)/(memories)/content.tsx
index 4514d851..8205c8b6 100644
--- a/apps/web/app/(dash)/(memories)/content.tsx
+++ b/apps/web/app/(dash)/(memories)/content.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Content, StoredSpace } from "@/server/db/schema";
-import { MemoriesIcon, NextIcon, SearchIcon, UrlIcon } from "@repo/ui/icons";
+import type { Content, StoredSpace } from "@/server/db/schema";
+import { MemoriesIcon, NextIcon, UrlIcon } from "@repo/ui/icons";
 import {
 	ArrowLeftIcon,
 	MenuIcon,
@@ -12,17 +12,15 @@ import {
 } from "lucide-react";
 import Image from "next/image";
 import Link from "next/link";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useMemo, useState } from "react";
 import Masonry from "react-layout-masonry";
 import { getRawTweet } from "@repo/shared-types/utils";
-import { MyTweet } from "../../../components/twitter/render-tweet";
+import { MyTweet } from "@/components/twitter/render-tweet";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
 	DropdownMenuItem,
-	DropdownMenuLabel,
 	DropdownMenuPortal,
-	DropdownMenuSeparator,
 	DropdownMenuSub,
 	DropdownMenuSubContent,
 	DropdownMenuSubTrigger,
diff --git a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
index ed1ea1cc..c7508ef4 100644
--- a/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
+++ b/apps/web/app/(dash)/(memories)/space/[spaceid]/page.tsx
@@ -4,11 +4,8 @@ import MemoriesPage from "../../content";
 import { db } from "@/server/db";
 import { and, eq } from "drizzle-orm";
 import { spacesAccess } from "@/server/db/schema";
-import { auth } from "@/server/auth";
 
 async function Page({ params: { spaceid } }: { params: { spaceid: number } }) {
-	const user = await auth();
-
 	const { success, data } = await getMemoriesInsideSpace(spaceid);
 	if (!success ?? !data) return redirect("/home");
 
diff --git a/apps/web/app/(dash)/chat/[chatid]/loading.tsx b/apps/web/app/(dash)/chat/[chatid]/loading.tsx
index 422adb8e..dbb9290c 100644
--- a/apps/web/app/(dash)/chat/[chatid]/loading.tsx
+++ b/apps/web/app/(dash)/chat/[chatid]/loading.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import { chatSearchParamsCache } from "../../../../lib/searchParams";
 import ChatWindow from "../chatWindow";
 
 async function Page({
diff --git a/apps/web/app/(dash)/dialogContentContainer.tsx b/apps/web/app/(dash)/dialogContentContainer.tsx
index 4e8d81ef..cb8c4ce1 100644
--- a/apps/web/app/(dash)/dialogContentContainer.tsx
+++ b/apps/web/app/(dash)/dialogContentContainer.tsx
@@ -1,9 +1,9 @@
-import { StoredSpace } from "@/server/db/schema";
+import type { StoredSpace } from "@/server/db/schema";
 import { useEffect, useMemo, useState } from "react";
-import { createMemory, createSpace } from "../actions/doers";
+import { createMemory, createSpace } from "@/app/actions/doers";
 import ComboboxWithCreate from "@repo/ui/shadcn/combobox";
 import { toast } from "sonner";
-import { getSpaces } from "../actions/fetchers";
+import { getSpaces } from "@/app/actions/fetchers";
 import { MinusIcon, PlusCircleIcon } from "lucide-react";
 import {
 	DialogContent,
diff --git a/apps/web/app/(dash)/header/header.tsx b/apps/web/app/(dash)/header/header.tsx
index eaade258..079b350c 100644
--- a/apps/web/app/(dash)/header/header.tsx
+++ b/apps/web/app/(dash)/header/header.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import Image from "next/image";
 import Link from "next/link";
-import Logo from "../../../public/logo.svg";
+import Logo from "@/public/logo.svg";
 
-import { getChatHistory } from "../../actions/fetchers";
+import { getChatHistory } from "@/app/actions/fetchers";
 import NewChatButton from "./newChatButton";
 import AutoBreadCrumbs from "./autoBreadCrumbs";
 import SignOutButton from "./signOutButton";
diff --git a/apps/web/app/(dash)/header/signOutButton.tsx b/apps/web/app/(dash)/header/signOutButton.tsx
index 4c61c74d..fb4049ea 100644
--- a/apps/web/app/(dash)/header/signOutButton.tsx
+++ b/apps/web/app/(dash)/header/signOutButton.tsx
@@ -5,8 +5,10 @@ export default function SignOutButton() {
 	return (
 		<form
 			action={async () => {
-				"use server";
-				await signOut();
+				"use server"
+				await signOut({
+          redirectTo: "/",
+        });
 			}}
 		>
 			<Button
diff --git a/apps/web/app/(dash)/layout.tsx b/apps/web/app/(dash)/layout.tsx
index c6174945..7a08c3cb 100644
--- a/apps/web/app/(dash)/layout.tsx
+++ b/apps/web/app/(dash)/layout.tsx
@@ -1,18 +1,11 @@
 import Header from "./header/header";
 import Menu from "./menu";
 import { redirect } from "next/navigation";
-import { auth } from "../../server/auth";
 import { Toaster } from "@repo/ui/shadcn/sonner";
-import BackgroundPlus from "../(landing)/GridPatterns/PlusGrid";
-import { getUser } from "../actions/fetchers";
+import BackgroundPlus from "@/app/(landing)/GridPatterns/PlusGrid";
+import { getUser } from "@/app/actions/fetchers";
 
 async function Layout({ children }: { children: React.ReactNode }) {
-	const info = await auth();
-
-	if (!info) {
-		return redirect("/signin");
-	}
-
 	const user = await getUser();
 	const hasOnboarded = user.data?.hasOnboarded;
 
diff --git a/apps/web/app/(dash)/menu.tsx b/apps/web/app/(dash)/menu.tsx
index c1173eb6..14432245 100644
--- a/apps/web/app/(dash)/menu.tsx
+++ b/apps/web/app/(dash)/menu.tsx
@@ -5,10 +5,9 @@ import Image from "next/image";
 import Link from "next/link";
 import {
 	MemoriesIcon,
-	ExploreIcon,
-	CanvasIcon,
 	AddIcon,
 	HomeIcon as HomeIconWeb,
+  CanvasIcon,
 } from "@repo/ui/icons";
 import { Button } from "@repo/ui/shadcn/button";
 import { MinusIcon, PlusCircleIcon } from "lucide-react";
@@ -24,12 +23,11 @@ import {
 import { Label } from "@repo/ui/shadcn/label";
 import { Textarea } from "@repo/ui/shadcn/textarea";
 import { toast } from "sonner";
-import { getSpaces } from "../actions/fetchers";
+import { getSpaces } from "@/app/actions/fetchers";
 import { HomeIcon } from "@heroicons/react/24/solid";
-import { createMemory, createSpace } from "../actions/doers";
+import { createMemory, createSpace } from "@/app/actions/doers";
 import ComboboxWithCreate from "@repo/ui/shadcn/combobox";
-import { StoredSpace } from "@/server/db/schema";
-import useMeasure from "react-use-measure";
+import type { StoredSpace } from "@/server/db/schema";
 import { useKeyPress } from "@/lib/useKeyPress";
 
 function Menu() {
diff --git a/apps/web/app/(landing)/page.tsx b/apps/web/app/(landing)/page.tsx
index b2b86818..bba0a92f 100644
--- a/apps/web/app/(landing)/page.tsx
+++ b/apps/web/app/(landing)/page.tsx
@@ -5,21 +5,13 @@ import Cta from "./Cta";
 import { Toaster } from "@repo/ui/shadcn/toaster";
 import Features from "./Features";
 import Footer from "./footer";
-import { auth } from "@/server/auth";
 import Services from "./Features/index";
 import { Showcases } from "./Showcase";
 import BackgroundPlus from "./GridPatterns/PlusGrid";
-import { redirect } from "next/navigation";
 
 export const runtime = "edge";
 
 export default async function Home() {
-	const user = await auth();
-
-	if (user) {
-		await redirect("/home");
-	}
-
 	return (
 		<>
 			<BackgroundPlus />
diff --git a/apps/web/app/robots.ts b/apps/web/app/robots.ts
new file mode 100644
index 00000000..92a94b74
--- /dev/null
+++ b/apps/web/app/robots.ts
@@ -0,0 +1,13 @@
+import { type MetadataRoute } from 'next'
+import { routeGroups, routeTypes } from '@/routes'
+
+export default function robots(): MetadataRoute.Robots {
+  return {
+    rules: {
+      userAgent: '*',
+      allow: [...routeGroups.landing],
+      disallow: [...routeTypes.authed],
+    },
+    sitemap: 'https://supermemory.ai/sitemap.xml',
+  }
+}
\ No newline at end of file
diff --git a/apps/web/app/sitemap.ts b/apps/web/app/sitemap.ts
new file mode 100644
index 00000000..f3c67863
--- /dev/null
+++ b/apps/web/app/sitemap.ts
@@ -0,0 +1,12 @@
+import { type MetadataRoute } from 'next'
+
+export default function sitemap(): MetadataRoute.Sitemap {
+  return [
+    {
+      url: 'https://supermemory.ai/',
+      lastModified: new Date(),
+      changeFrequency: 'yearly',
+      priority: 1,
+    }
+  ]
+}
\ No newline at end of file
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 9e1e335f..6b082f8e 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -1,4 +1,6 @@
-import { NextRequest, NextResponse } from "next/server";
+import { type NextRequest, NextResponse } from "next/server";
+import { auth } from "./server/auth";
+import { routeTypes } from "@/routes";
 
 const corsHeaders = {
 	"Access-Control-Allow-Origin": "*",
@@ -6,19 +8,35 @@ const corsHeaders = {
 	"Access-Control-Allow-Headers": "Content-Type, Authorization",
 };
 
-export function middleware(request: NextRequest) {
-	if (request.method === "OPTIONS") {
-		return new NextResponse(null, { headers: corsHeaders });
-	}
+export async function middleware(request: NextRequest) {
+  if (request.nextUrl.pathname.startsWith("/api")) {
+    if (request.method === "OPTIONS") {
+      return new NextResponse(null, { headers: corsHeaders });
+    }
 
-	const response = NextResponse.next();
-	Object.entries(corsHeaders).forEach(([key, value]) => {
-		response.headers.set(key, value);
-	});
-
-	return response;
+    const response = NextResponse.next();
+    Object.entries(corsHeaders).forEach(([key, value]) => {
+      response.headers.set(key, value);
+    });
+    return response;
+  }
+  const info = await auth();
+  if (routeTypes.authed.some((route) => request.nextUrl.pathname.startsWith(route))) {
+    if (!info) {
+      return NextResponse.redirect(new URL("/signin", request.nextUrl));
+    }
+  } else if (routeTypes.unAuthedOnly.some((route) => request.nextUrl.pathname.endsWith(route))) {
+    if (info) {
+      return NextResponse.redirect(new URL("/home", request.nextUrl));
+    }
+  }
+  return NextResponse.next();
 }
 
 export const config = {
-	matcher: "/api/:path*",
+  matcher: [
+    '/((?!_next/static|_next/image|image|favicon.ico).*)',
+    '/api/:path*',
+    '/.:path*',
+  ]
 };
diff --git a/apps/web/routes.ts b/apps/web/routes.ts
new file mode 100644
index 00000000..e3ce910b
--- /dev/null
+++ b/apps/web/routes.ts
@@ -0,0 +1,13 @@
+export const routeGroups = {
+  auth: ["/privacy", "/signin", "/tos"],
+  canvas: ["/canvas"],
+  dash: ["/memories", "/space", "/chat", "/home", "/note"],
+  landing: ["/"],
+  other: ["/ref", "/onboarding"],
+};
+
+export const routeTypes = {
+  authed: [...routeGroups.canvas, ...routeGroups.dash, ...routeGroups.other],
+  unauthed: [...routeGroups.auth, ...routeGroups.landing],
+  unAuthedOnly: [...routeGroups.landing, "/signin"],
+}
\ No newline at end of file