diff --git a/app/root.tsx b/app/root.tsx
index 4707223..dd053ad 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -7,6 +7,7 @@ import {
   ScrollRestoration,
 } from "react-router";
 import type { Route } from "./+types/root";
+import { AuthProvider } from "@/app/context/auth-context";
 import "./app.css";
 
 export const links: Route.LinksFunction = () => [
@@ -41,7 +42,11 @@ export function Layout({ children }: { children: React.ReactNode }) {
 }
 
 export default function App() {
-  return <Outlet />;
+  return (
+    <AuthProvider>
+      <Outlet />
+    </AuthProvider>
+  );
 }
 
 export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
diff --git a/app/routes.ts b/app/routes.ts
index 8fa14aa..59661c4 100644
--- a/app/routes.ts
+++ b/app/routes.ts
@@ -5,5 +5,8 @@ export default [
     route("login", "routes/login.tsx"),
     route("register", "routes/register.tsx"),
     route("forms", "routes/forms.tsx"),
-    route("forms/:id", "routes/form.tsx"),
+    route("forms/new", "routes/create-form.tsx"),
+    route("form/:id", "routes/form.tsx"),
+    route("form/:id/edit", "routes/edit-form.tsx"),
+    route("*", "routes/not-found.tsx"),
 ] satisfies RouteConfig;