diff --git a/app/admin/form/[id]/extra/page.tsx b/app/admin/form/[id]/extra/page.tsx
index c234a5a..1be39f4 100644
--- a/app/admin/form/[id]/extra/page.tsx
+++ b/app/admin/form/[id]/extra/page.tsx
@@ -22,7 +22,7 @@ export default async function AdminExtraPage(
   return (
     <>
       <RealtimeRefresh topic="forms" formId={form.id} />
-      <div className="mx-auto w-full max-w-6xl p-4 pb-12 md:p-6">
+      <div className="w-full p-4 pb-12 md:p-6">
         <FormExtraClient form={form} />
       </div>
     </>
diff --git a/app/admin/form/[id]/layout.tsx b/app/admin/form/[id]/layout.tsx
index 76f9195..1f7f52b 100644
--- a/app/admin/form/[id]/layout.tsx
+++ b/app/admin/form/[id]/layout.tsx
@@ -12,10 +12,7 @@ import { notFound } from "next/navigation";
 import { isFormAcceptingSubmissions } from "@/lib/form/form-availability";
 
 export const metadata: Metadata = {
-  title: {
-    default: "Admin",
-    template: "%s | Erika!",
-  },
+  title: "Admin Form",
 }
 
 export default async function AdminFormLayout(
@@ -48,7 +45,7 @@ export default async function AdminFormLayout(
 
   return (
     <SidebarProvider>
-      <div className="flex w-full bg-background text-foreground">
+      <div className="flex min-h-svh w-full bg-background text-foreground">
         <FormAdminSidebar
           formId={params.id}
           formTitle={form.title}
@@ -62,7 +59,7 @@ export default async function AdminFormLayout(
           <div className="md:hidden p-2">
             <SidebarTrigger />
           </div>
-          <main>{props.children}</main>
+          <main className="w-full">{props.children}</main>
         </div>
       </div>
     </SidebarProvider>
diff --git a/app/admin/form/[id]/loading.tsx b/app/admin/form/[id]/loading.tsx
index 415fbfa..54e0c51 100644
--- a/app/admin/form/[id]/loading.tsx
+++ b/app/admin/form/[id]/loading.tsx
@@ -3,7 +3,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 
 export default function AdminFormLoading() {
   return (
-    <div className="mx-auto flex w-full max-w-6xl flex-col gap-4 p-4 md:p-6">
+    <div className="flex w-full flex-col gap-4 p-4 md:p-6">
       <Card>
         <CardHeader>
           <Skeleton className="h-6 w-44" />
diff --git a/app/admin/form/[id]/page.tsx b/app/admin/form/[id]/page.tsx
index d5eee1c..1e03155 100644
--- a/app/admin/form/[id]/page.tsx
+++ b/app/admin/form/[id]/page.tsx
@@ -27,7 +27,7 @@ export default async function AdminDashboardPage(
   return (
     <>
       <RealtimeRefresh topic="forms" formId={form.id} />
-      <div className="mx-auto w-full max-w-6xl p-4 pb-12 md:p-6">
+      <div className="w-full p-4 pb-12 md:p-6">
         <FormEditorClient
           form={{
             ...form,
diff --git a/app/admin/form/[id]/result/[submissionId]/page.tsx b/app/admin/form/[id]/result/[submissionId]/page.tsx
index 9e41efe..a666537 100644
--- a/app/admin/form/[id]/result/[submissionId]/page.tsx
+++ b/app/admin/form/[id]/result/[submissionId]/page.tsx
@@ -100,7 +100,7 @@ export default async function SubmissionDetailPage({
   const nextId = next?.id ?? null;
 
   return (
-    <div className="space-y-6 w-full max-w-6xl mx-auto p-4 md:p-6 pb-10">
+    <div className="w-full space-y-6 p-4 pb-10 md:p-6">
       <RealtimeRefresh topic="submissions" formId={formId} />
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <Button variant="ghost" asChild className="self-start">
diff --git a/app/admin/form/[id]/result/page.tsx b/app/admin/form/[id]/result/page.tsx
index c612c75..0edb734 100644
--- a/app/admin/form/[id]/result/page.tsx
+++ b/app/admin/form/[id]/result/page.tsx
@@ -79,7 +79,7 @@ export default async function ResultsListPage({
     `/admin/form/${id}/result/${submissionId}${returnQuery ? `?return=${encodeURIComponent(returnQuery)}` : ""}`;
 
   return (
-    <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 p-4 pb-12 md:p-6">
+    <div className="flex w-full flex-col gap-6 p-4 pb-12 md:p-6">
       <RealtimeRefresh topic="submissions" formId={id} />
       <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
         <div>
diff --git a/components/admin-shell.tsx b/components/admin-shell.tsx
index 3899821..f56fe2f 100644
--- a/components/admin-shell.tsx
+++ b/components/admin-shell.tsx
@@ -101,7 +101,7 @@ export function AdminShell({
 
   return (
     <SidebarProvider>
-      <div className="flex w-full min-h-screen bg-background text-foreground">
+      <div className="flex min-h-screen w-full bg-background text-foreground">
         <Sidebar variant="sidebar" collapsible="icon">
           <SidebarHeader className="border-b border-border py-4 px-4">
             <Link href="/admin">