diff --git a/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx b/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx
index 56112e10..61e98830 100644
--- a/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx
@@ -1,7 +1,7 @@
 import { getFormProps, getTextareaProps, useForm } from "@conform-to/react";
 import { getZodConstraint, parseWithZod } from "@conform-to/zod";
 import type { ActionFunction, LoaderFunction } from "@remix-run/node";
-import { useActionData, useLoaderData } from "@remix-run/react";
+import { useLoaderData } from "@remix-run/react";
 import { useFetcher } from "@remix-run/react";
 import { z } from "zod";
 import { authenticator } from "~/utils/auth.server";
@@ -97,11 +97,10 @@ export const action: ActionFunction = async ({ request, params }) => {
 
 export default function EditPage() {
 	const { currentUser, page } = useLoaderData<typeof loader>();
-	const actionData = useActionData<typeof action>();
-	const fetcher = useFetcher();
+	const fetcher = useFetcher<typeof action>();
 	const [form, { title, pageContent }] = useForm({
 		id: "edit-page",
-		lastResult: actionData?.lastResult,
+		lastResult: fetcher.data?.lastResult,
 		constraint: getZodConstraint(schema),
 		shouldValidate: "onBlur",
 		shouldRevalidate: "onInput",
diff --git a/web/app/routes/$userName+/page+/$slug+/edit/components/EditHeader.tsx b/web/app/routes/$userName+/page+/$slug+/edit/components/EditHeader.tsx
index 7f73727e..afcf5ee8 100644
--- a/web/app/routes/$userName+/page+/$slug+/edit/components/EditHeader.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/edit/components/EditHeader.tsx
@@ -33,22 +33,22 @@ export function EditHeader({
 	return (
 		<header className="mb-10 z-10 ">
 			<div className="max-w-7xl mx-auto py-4 px-4 sm:px-6  flex justify-between items-center">
-				<Button variant="ghost">
-					<Link
-						to={
-							pageSlug
-								? `/${currentUser?.userName}/page/${pageSlug}`
-								: `/${currentUser?.userName}`
-						}
-						className="text-gray-600 hover:text-gray-900 dark:text-gray-300 dark:hover:text-white"
-					>
+				<Link
+					to={
+						pageSlug
+							? `/${currentUser?.userName}/page/${pageSlug}`
+							: `/${currentUser?.userName}`
+					}
+					className="text-gray-600 hover:text-gray-900 dark:text-gray-300 dark:hover:text-white"
+				>
+					<Button variant="ghost">
 						{isLoading ? (
 							<Loader2 className="w-6 h-6 animate-spin" />
 						) : (
 							<ArrowLeft className="w-6 h-6" />
 						)}
-					</Link>
-				</Button>
+					</Button>
+				</Link>
 				<Button type="submit" variant="ghost" disabled={isSubmitting}>
 					{isSubmitting ? (
 						<>