diff --git a/app/admin/backend/actions.ts b/app/(ui)/admin/backend/actions.ts
similarity index 100%
rename from app/admin/backend/actions.ts
rename to app/(ui)/admin/backend/actions.ts
diff --git a/app/admin/backend/client.tsx b/app/(ui)/admin/backend/client.tsx
similarity index 100%
rename from app/admin/backend/client.tsx
rename to app/(ui)/admin/backend/client.tsx
diff --git a/app/admin/backend/page.tsx b/app/(ui)/admin/backend/page.tsx
similarity index 100%
rename from app/admin/backend/page.tsx
rename to app/(ui)/admin/backend/page.tsx
diff --git a/app/admin/client.tsx b/app/(ui)/admin/client.tsx
similarity index 100%
rename from app/admin/client.tsx
rename to app/(ui)/admin/client.tsx
diff --git a/app/admin/form/[id]/client.tsx b/app/(ui)/admin/form/[id]/client.tsx
similarity index 99%
rename from app/admin/form/[id]/client.tsx
rename to app/(ui)/admin/form/[id]/client.tsx
index 1100239..05b10b0 100644
--- a/app/admin/form/[id]/client.tsx
+++ b/app/(ui)/admin/form/[id]/client.tsx
@@ -12,7 +12,7 @@ import { Switch } from "@/components/ui/switch";
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Separator } from "@/components/ui/separator";
 import { toast } from "sonner";
-import { updateForm } from "@/app/admin/form/actions";
+import { updateForm } from "@/app/(ui)/admin/form/actions";
 import {
   createQuestion,
   updateQuestion,
diff --git a/app/admin/form/[id]/extra/client.tsx b/app/(ui)/admin/form/[id]/extra/client.tsx
similarity index 99%
rename from app/admin/form/[id]/extra/client.tsx
rename to app/(ui)/admin/form/[id]/extra/client.tsx
index 7b97eca..2ba554d 100644
--- a/app/admin/form/[id]/extra/client.tsx
+++ b/app/(ui)/admin/form/[id]/extra/client.tsx
@@ -8,7 +8,7 @@ import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Label } from "@/components/ui/label";
 import { toast } from "sonner";
-import { testDiscordWebhook, updateForm } from "@/app/admin/form/actions";
+import { testDiscordWebhook, updateForm } from "@/app/(ui)/admin/form/actions";
 import { Loader2, ChevronDown, Send } from "lucide-react";
 import { getGuildRoles } from "@/app/actions/discord";
 import type { DiscordRole } from "@/lib/discord/discord";
diff --git a/app/admin/form/[id]/extra/page.tsx b/app/(ui)/admin/form/[id]/extra/page.tsx
similarity index 100%
rename from app/admin/form/[id]/extra/page.tsx
rename to app/(ui)/admin/form/[id]/extra/page.tsx
diff --git a/app/admin/form/[id]/layout.tsx b/app/(ui)/admin/form/[id]/layout.tsx
similarity index 96%
rename from app/admin/form/[id]/layout.tsx
rename to app/(ui)/admin/form/[id]/layout.tsx
index 1f7f52b..9db27c3 100644
--- a/app/admin/form/[id]/layout.tsx
+++ b/app/(ui)/admin/form/[id]/layout.tsx
@@ -45,7 +45,7 @@ export default async function AdminFormLayout(
 
   return (
     <SidebarProvider>
-      <div className="flex min-h-svh w-full bg-background text-foreground">
+      <div className="flex min-h-svh w-full bg-transparent text-foreground">
         <FormAdminSidebar
           formId={params.id}
           formTitle={form.title}
diff --git a/app/admin/form/[id]/loading.tsx b/app/(ui)/admin/form/[id]/loading.tsx
similarity index 100%
rename from app/admin/form/[id]/loading.tsx
rename to app/(ui)/admin/form/[id]/loading.tsx
diff --git a/app/admin/form/[id]/page.tsx b/app/(ui)/admin/form/[id]/page.tsx
similarity index 100%
rename from app/admin/form/[id]/page.tsx
rename to app/(ui)/admin/form/[id]/page.tsx
diff --git a/app/admin/form/[id]/preview/page.tsx b/app/(ui)/admin/form/[id]/preview/page.tsx
similarity index 94%
rename from app/admin/form/[id]/preview/page.tsx
rename to app/(ui)/admin/form/[id]/preview/page.tsx
index aa17503..df75673 100644
--- a/app/admin/form/[id]/preview/page.tsx
+++ b/app/(ui)/admin/form/[id]/preview/page.tsx
@@ -1,7 +1,7 @@
 import { db } from "@/db";
 import { notFound } from "next/navigation";
 import { Badge } from "@/components/ui/badge";
-import { FormFillerClient } from "@/app/form/client";
+import { FormFillerClient } from "@/app/(ui)/form/client";
 
 export const dynamic = "force-dynamic";
 
diff --git a/app/admin/form/[id]/result/[submissionId]/client.tsx b/app/(ui)/admin/form/[id]/result/[submissionId]/client.tsx
similarity index 99%
rename from app/admin/form/[id]/result/[submissionId]/client.tsx
rename to app/(ui)/admin/form/[id]/result/[submissionId]/client.tsx
index 81a3ba1..4e92006 100644
--- a/app/admin/form/[id]/result/[submissionId]/client.tsx
+++ b/app/(ui)/admin/form/[id]/result/[submissionId]/client.tsx
@@ -42,7 +42,7 @@ import { stripHtml } from "@/lib/utils";
 import { HtmlDisplay } from "@/components/html-display";
 import { formatStoredAnswer } from "@/lib/form/form-answer-values";
 import { normalizeStoredAnswerSnapshot } from "@/lib/form/submission-intake";
-import { updateSubmissionAdminNote } from "@/app/admin/form/actions";
+import { updateSubmissionAdminNote } from "@/app/(ui)/admin/form/actions";
 import {
   useDebouncedAutoSave,
 } from "@/hooks/use-debounced-autosave";
diff --git a/app/admin/form/[id]/result/[submissionId]/page.tsx b/app/(ui)/admin/form/[id]/result/[submissionId]/page.tsx
similarity index 100%
rename from app/admin/form/[id]/result/[submissionId]/page.tsx
rename to app/(ui)/admin/form/[id]/result/[submissionId]/page.tsx
diff --git a/app/admin/form/[id]/result/client.tsx b/app/(ui)/admin/form/[id]/result/client.tsx
similarity index 100%
rename from app/admin/form/[id]/result/client.tsx
rename to app/(ui)/admin/form/[id]/result/client.tsx
diff --git a/app/admin/form/[id]/result/export/route.ts b/app/(ui)/admin/form/[id]/result/export/route.ts
similarity index 100%
rename from app/admin/form/[id]/result/export/route.ts
rename to app/(ui)/admin/form/[id]/result/export/route.ts
diff --git a/app/admin/form/[id]/result/page.tsx b/app/(ui)/admin/form/[id]/result/page.tsx
similarity index 100%
rename from app/admin/form/[id]/result/page.tsx
rename to app/(ui)/admin/form/[id]/result/page.tsx
diff --git a/app/admin/form/[id]/sidebar-client.tsx b/app/(ui)/admin/form/[id]/sidebar-client.tsx
similarity index 99%
rename from app/admin/form/[id]/sidebar-client.tsx
rename to app/(ui)/admin/form/[id]/sidebar-client.tsx
index bb66736..e008c7d 100644
--- a/app/admin/form/[id]/sidebar-client.tsx
+++ b/app/(ui)/admin/form/[id]/sidebar-client.tsx
@@ -40,7 +40,7 @@ import { GuardedLink } from "@/components/guarded-link";
 import { Badge } from "@/components/ui/badge";
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
-import { getResponseNavigation } from "@/app/admin/form/actions";
+import { getResponseNavigation } from "@/app/(ui)/admin/form/actions";
 
 type ResponseNavigationData = Awaited<ReturnType<typeof getResponseNavigation>>;
 
diff --git a/app/admin/form/actions.ts b/app/(ui)/admin/form/actions.ts
similarity index 100%
rename from app/admin/form/actions.ts
rename to app/(ui)/admin/form/actions.ts
diff --git a/app/admin/form/page.tsx b/app/(ui)/admin/form/page.tsx
similarity index 100%
rename from app/admin/form/page.tsx
rename to app/(ui)/admin/form/page.tsx
diff --git a/app/admin/layout.tsx b/app/(ui)/admin/layout.tsx
similarity index 100%
rename from app/admin/layout.tsx
rename to app/(ui)/admin/layout.tsx
diff --git a/app/admin/login/page.tsx b/app/(ui)/admin/login/page.tsx
similarity index 100%
rename from app/admin/login/page.tsx
rename to app/(ui)/admin/login/page.tsx
diff --git a/app/admin/page.tsx b/app/(ui)/admin/page.tsx
similarity index 100%
rename from app/admin/page.tsx
rename to app/(ui)/admin/page.tsx
diff --git a/app/admin/upload/actions.ts b/app/(ui)/admin/upload/actions.ts
similarity index 100%
rename from app/admin/upload/actions.ts
rename to app/(ui)/admin/upload/actions.ts
diff --git a/app/admin/upload/client.tsx b/app/(ui)/admin/upload/client.tsx
similarity index 100%
rename from app/admin/upload/client.tsx
rename to app/(ui)/admin/upload/client.tsx
diff --git a/app/admin/upload/history/page.tsx b/app/(ui)/admin/upload/history/page.tsx
similarity index 100%
rename from app/admin/upload/history/page.tsx
rename to app/(ui)/admin/upload/history/page.tsx
diff --git a/app/admin/upload/layout.tsx b/app/(ui)/admin/upload/layout.tsx
similarity index 100%
rename from app/admin/upload/layout.tsx
rename to app/(ui)/admin/upload/layout.tsx
diff --git a/app/admin/upload/page.tsx b/app/(ui)/admin/upload/page.tsx
similarity index 100%
rename from app/admin/upload/page.tsx
rename to app/(ui)/admin/upload/page.tsx
diff --git a/app/admin/upload/upload-navigation.tsx b/app/(ui)/admin/upload/upload-navigation.tsx
similarity index 100%
rename from app/admin/upload/upload-navigation.tsx
rename to app/(ui)/admin/upload/upload-navigation.tsx
diff --git a/app/admin/upload/video/latest-card.tsx b/app/(ui)/admin/upload/video/latest-card.tsx
similarity index 100%
rename from app/admin/upload/video/latest-card.tsx
rename to app/(ui)/admin/upload/video/latest-card.tsx
diff --git a/app/admin/upload/video/page.tsx b/app/(ui)/admin/upload/video/page.tsx
similarity index 100%
rename from app/admin/upload/video/page.tsx
rename to app/(ui)/admin/upload/video/page.tsx
diff --git a/app/client.tsx b/app/(ui)/client.tsx
similarity index 64%
rename from app/client.tsx
rename to app/(ui)/client.tsx
index 123d1cb..377629b 100644
--- a/app/client.tsx
+++ b/app/(ui)/client.tsx
@@ -2,8 +2,33 @@
 
 import { useState, type ReactNode } from "react";
 import { ArrowLeft, ArrowRight } from "lucide-react";
+import { Toaster } from "sonner";
 import { Button } from "@/components/ui/button";
 import { CardContent } from "@/components/ui/card";
+import { PageProgress } from "@/components/page-progress";
+import { ThemeProvider } from "@/components/theme-provider";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { VersionCheck } from "@/components/version-check";
+
+export function UiProviders({ children }: { children: ReactNode }) {
+  return (
+    <>
+      <PageProgress />
+      <ThemeProvider
+        attribute="class"
+        defaultTheme="dark"
+        enableSystem
+        disableTransitionOnChange
+      >
+        <TooltipProvider>
+          <Toaster richColors closeButton position="bottom-right" theme="dark" />
+          <VersionCheck />
+          {children}
+        </TooltipProvider>
+      </ThemeProvider>
+    </>
+  );
+}
 
 export function LinkCarousel({
   primary,
diff --git a/app/discord/page.tsx b/app/(ui)/discord/page.tsx
similarity index 100%
rename from app/discord/page.tsx
rename to app/(ui)/discord/page.tsx
diff --git a/app/form/[id]/layout.tsx b/app/(ui)/form/[id]/layout.tsx
similarity index 100%
rename from app/form/[id]/layout.tsx
rename to app/(ui)/form/[id]/layout.tsx
diff --git a/app/form/[id]/not-found.tsx b/app/(ui)/form/[id]/not-found.tsx
similarity index 100%
rename from app/form/[id]/not-found.tsx
rename to app/(ui)/form/[id]/not-found.tsx
diff --git a/app/form/[id]/page.tsx b/app/(ui)/form/[id]/page.tsx
similarity index 100%
rename from app/form/[id]/page.tsx
rename to app/(ui)/form/[id]/page.tsx
diff --git a/app/form/client.tsx b/app/(ui)/form/client.tsx
similarity index 100%
rename from app/form/client.tsx
rename to app/(ui)/form/client.tsx
diff --git a/app/form/layout.tsx b/app/(ui)/form/layout.tsx
similarity index 94%
rename from app/form/layout.tsx
rename to app/(ui)/form/layout.tsx
index 4356ecb..77c97ad 100644
--- a/app/form/layout.tsx
+++ b/app/(ui)/form/layout.tsx
@@ -47,7 +47,7 @@ export default async function FormLayout({
   }
 
   return (
-    <div className="relative flex min-h-screen w-full flex-1 flex-col overflow-x-hidden bg-background text-foreground">
+    <div className="relative flex min-h-svh w-full flex-1 flex-col overflow-x-hidden">
       <header className="relative z-10 flex shrink-0 items-center justify-between border-b border-border bg-background/90 px-6 py-3 backdrop-blur">
         <Link href="/">
           <span className="font-semibold text-sm">
diff --git a/app/form/page.tsx b/app/(ui)/form/page.tsx
similarity index 100%
rename from app/form/page.tsx
rename to app/(ui)/form/page.tsx
diff --git a/app/(ui)/layout.tsx b/app/(ui)/layout.tsx
new file mode 100644
index 0000000..b54e1de
--- /dev/null
+++ b/app/(ui)/layout.tsx
@@ -0,0 +1,24 @@
+import Image from "next/image";
+import Background from "@/public/background/space.webp";
+import { UiProviders } from "./client";
+
+export default function UiLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <UiProviders>
+      <div className="relative isolate min-h-svh overflow-x-clip text-foreground">
+        <Image
+          src={Background}
+          alt=""
+          priority
+          sizes="100vw"
+          className="pointer-events-none fixed inset-0 -z-20 size-full object-cover opacity-40"
+        />
+        <div
+          aria-hidden="true"
+          className="pointer-events-none fixed inset-0 -z-10 bg-background/40"
+        />
+        {children}
+      </div>
+    </UiProviders>
+  );
+}
diff --git a/app/leaderboard/client.tsx b/app/(ui)/leaderboard/client.tsx
similarity index 100%
rename from app/leaderboard/client.tsx
rename to app/(ui)/leaderboard/client.tsx
diff --git a/app/leaderboard/content.tsx b/app/(ui)/leaderboard/content.tsx
similarity index 100%
rename from app/leaderboard/content.tsx
rename to app/(ui)/leaderboard/content.tsx
diff --git a/app/leaderboard/layout.tsx b/app/(ui)/leaderboard/layout.tsx
similarity index 62%
rename from app/leaderboard/layout.tsx
rename to app/(ui)/leaderboard/layout.tsx
index 83754fb..f208253 100644
--- a/app/leaderboard/layout.tsx
+++ b/app/(ui)/leaderboard/layout.tsx
@@ -4,7 +4,7 @@ export default function LeaderboardLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <main className="relative min-h-screen overflow-hidden bg-background text-foreground">
+    <main className="relative min-h-svh overflow-hidden">
       {children}
     </main>
   );
diff --git a/app/leaderboard/route.ts b/app/(ui)/leaderboard/route.ts
similarity index 100%
rename from app/leaderboard/route.ts
rename to app/(ui)/leaderboard/route.ts
diff --git a/app/leaderboard/vc/page.tsx b/app/(ui)/leaderboard/vc/page.tsx
similarity index 100%
rename from app/leaderboard/vc/page.tsx
rename to app/(ui)/leaderboard/vc/page.tsx
diff --git a/app/leaderboard/xp/page.tsx b/app/(ui)/leaderboard/xp/page.tsx
similarity index 100%
rename from app/leaderboard/xp/page.tsx
rename to app/(ui)/leaderboard/xp/page.tsx
diff --git a/app/page.tsx b/app/(ui)/page.tsx
similarity index 93%
rename from app/page.tsx
rename to app/(ui)/page.tsx
index f789c49..5a5557a 100644
--- a/app/page.tsx
+++ b/app/(ui)/page.tsx
@@ -8,7 +8,6 @@ import { Finger_Paint } from "next/font/google";
 import { connection } from "next/server";
 import { getFollowerCounts } from "@/lib/followers";
 import { Share2, Trophy } from "lucide-react";
-import Background from "@/public/background/space.webp";
 import {
   formatCount,
   getCountForLink,
@@ -128,18 +127,11 @@ export default async function Home() {
 
 
   return (
-    <main className="relative flex min-h-screen flex-col items-center justify-center bg-background p-4 text-foreground">
+    <main className="relative flex min-h-svh flex-col items-center justify-center p-4">
       <script
         type="application/ld+json"
         dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
       />
-      <Image
-        src={Background}
-        alt="Background"
-        fill
-        priority
-        className="fixed top-0 left-0 z-0 h-fit min-h-dvh w-full object-cover opacity-40"
-      />
       <Card className="relative z-10 w-full max-w-sm bg-card/90 backdrop-blur md:max-w-lg" role="article">
         <CardHeader className="flex flex-col items-center gap-4 text-center">
           <div className="relative w-24 h-24 overflow-hidden rounded-full">
diff --git a/app/privacy/page.tsx b/app/(ui)/privacy/page.tsx
similarity index 98%
rename from app/privacy/page.tsx
rename to app/(ui)/privacy/page.tsx
index f1f0bf2..9de50b3 100644
--- a/app/privacy/page.tsx
+++ b/app/(ui)/privacy/page.tsx
@@ -13,7 +13,7 @@ export const metadata: Metadata = {
 
 export default function PrivacyPolicyPage() {
   return (
-    <main className="min-h-screen flex flex-col items-center p-4 md:p-8">
+    <main className="flex flex-col items-center p-4 md:p-8">
       <div className="w-full max-w-2xl space-y-6">
         <div className="flex items-center gap-2">
           <Link href="/">
diff --git a/app/profile/client.tsx b/app/(ui)/profile/client.tsx
similarity index 100%
rename from app/profile/client.tsx
rename to app/(ui)/profile/client.tsx
diff --git a/app/profile/content.tsx b/app/(ui)/profile/content.tsx
similarity index 100%
rename from app/profile/content.tsx
rename to app/(ui)/profile/content.tsx
diff --git a/app/profile/layout.tsx b/app/(ui)/profile/layout.tsx
similarity index 89%
rename from app/profile/layout.tsx
rename to app/(ui)/profile/layout.tsx
index f7eeba4..e166635 100644
--- a/app/profile/layout.tsx
+++ b/app/(ui)/profile/layout.tsx
@@ -9,7 +9,7 @@ export default function ProfileLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <main className="relative min-h-screen overflow-hidden bg-background text-foreground">
+    <main className="relative min-h-svh overflow-hidden">
       <div className="relative mx-auto flex w-full max-w-5xl flex-col gap-6 px-4 py-6 sm:px-6 lg:py-10">
         <nav aria-label="ทางลัด" className="flex items-center justify-between gap-3">
           <Button variant="ghost" asChild>
diff --git a/app/profile/page.tsx b/app/(ui)/profile/page.tsx
similarity index 100%
rename from app/profile/page.tsx
rename to app/(ui)/profile/page.tsx
diff --git a/app/share/[id]/client.tsx b/app/(ui)/share/[id]/client.tsx
similarity index 100%
rename from app/share/[id]/client.tsx
rename to app/(ui)/share/[id]/client.tsx
diff --git a/app/share/[id]/page.tsx b/app/(ui)/share/[id]/page.tsx
similarity index 99%
rename from app/share/[id]/page.tsx
rename to app/(ui)/share/[id]/page.tsx
index 99c62fe..d1f5f49 100644
--- a/app/share/[id]/page.tsx
+++ b/app/(ui)/share/[id]/page.tsx
@@ -10,7 +10,7 @@ import {
   CopyShareActions,
   DeleteCommentButton,
   DeleteShareButton,
-} from "@/app/share/[id]/client";
+} from "./client";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import {
diff --git a/app/share/client.tsx b/app/(ui)/share/client.tsx
similarity index 100%
rename from app/share/client.tsx
rename to app/(ui)/share/client.tsx
diff --git a/app/share/layout.tsx b/app/(ui)/share/layout.tsx
similarity index 94%
rename from app/share/layout.tsx
rename to app/(ui)/share/layout.tsx
index aabe8a2..7002160 100644
--- a/app/share/layout.tsx
+++ b/app/(ui)/share/layout.tsx
@@ -1,7 +1,7 @@
 import type { Metadata } from "next";
 import Link from "next/link";
 import { getServerSession } from "next-auth";
-import { ArrowLeft, List, Plus } from "lucide-react";
+import { ArrowLeft } from "lucide-react";
 import { DropdownMenuAvatar } from "@/components/avatar";
 import { Button } from "@/components/ui/button";
 import { ThemeToggle } from "@/components/theme-toggle";
@@ -22,7 +22,7 @@ export default async function ShareLayout({ children }: { children: React.ReactN
     : null;
 
   return (
-    <div className="min-h-screen bg-background text-foreground">
+    <div className="min-h-svh">
       <header className="sticky top-0 z-10 border-b bg-background/90 backdrop-blur">
         <div className="mx-auto flex h-14 max-w-6xl items-center justify-between gap-4 px-4 sm:px-6">
           <div className="flex items-center gap-3">
diff --git a/app/share/page.tsx b/app/(ui)/share/page.tsx
similarity index 95%
rename from app/share/page.tsx
rename to app/(ui)/share/page.tsx
index 0b251f7..2e995aa 100644
--- a/app/share/page.tsx
+++ b/app/(ui)/share/page.tsx
@@ -2,7 +2,7 @@ import { getServerSession } from "next-auth";
 import { LoginDialog } from "@/components/login-dialog";
 import { authOptions } from "@/lib/auth/auth-options";
 import { getSessionDiscordId } from "@/lib/auth/auth";
-import { ShareUploadClient } from "@/app/share/client";
+import { ShareUploadClient } from "./client";
 
 export const dynamic = "force-dynamic";
 
diff --git a/app/tos/page.tsx b/app/(ui)/tos/page.tsx
similarity index 98%
rename from app/tos/page.tsx
rename to app/(ui)/tos/page.tsx
index 5f1c232..47ff0c2 100644
--- a/app/tos/page.tsx
+++ b/app/(ui)/tos/page.tsx
@@ -12,7 +12,7 @@ export const metadata: Metadata = {
 
 export default function TermsOfServicePage() {
   return (
-    <main className="min-h-screen flex flex-col items-center p-4 md:p-8">
+    <main className="flex flex-col items-center p-4 md:p-8">
       <div className="w-full max-w-2xl space-y-6">
         <div className="flex items-center gap-2">
           <Link href="/">
diff --git a/app/layout.tsx b/app/layout.tsx
index 2a065cf..e6641e0 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,7 +1,6 @@
 import type { Metadata } from "next";
 import { Anuphan, Inter } from "next/font/google";
 import "./globals.css";
-import { cn } from "@/lib/utils";
 import { config } from "@/lib/config";
 
 const inter = Inter({
@@ -65,12 +64,6 @@ export const metadata: Metadata = {
   },
 };
 
-import { TooltipProvider } from "@/components/ui/tooltip";
-import { Toaster } from "sonner";
-import { ThemeProvider } from "@/components/theme-provider";
-import { PageProgress } from "@/components/page-progress";
-import { VersionCheck } from "@/components/version-check";
-
 export default function RootLayout({
   children,
 }: Readonly<{
@@ -79,28 +72,11 @@ export default function RootLayout({
   return (
     <html
       lang="th"
-      className={cn(
-        "h-full",
-        "antialiased",
-        inter.variable,
-        anuphan.variable,
-      )}
+      className={`dark h-full antialiased ${inter.variable} ${anuphan.variable}`}
       suppressHydrationWarning
     >
       <body className="font-app" suppressHydrationWarning>
-        <PageProgress />
-        <ThemeProvider
-          attribute="class"
-          defaultTheme="dark"
-          enableSystem
-          disableTransitionOnChange
-        >
-        <TooltipProvider>
-          <Toaster richColors closeButton position="bottom-right" theme="dark" />
-          <VersionCheck />
-          {children}
-        </TooltipProvider>
-        </ThemeProvider>
+        {children}
       </body>
     </html>
   );
diff --git a/components/admin-shell.tsx b/components/admin-shell.tsx
index f56fe2f..3fcd69a 100644
--- a/components/admin-shell.tsx
+++ b/components/admin-shell.tsx
@@ -99,9 +99,13 @@ export function AdminShell({
 }) {
   const pathname = usePathname();
 
+  if (/^\/admin\/form\/[^/]+/.test(pathname)) {
+    return children;
+  }
+
   return (
     <SidebarProvider>
-      <div className="flex min-h-screen w-full bg-background text-foreground">
+      <div className="flex min-h-svh w-full bg-transparent text-foreground">
         <Sidebar variant="sidebar" collapsible="icon">
           <SidebarHeader className="border-b border-border py-4 px-4">
             <Link href="/admin">
@@ -157,7 +161,7 @@ export function AdminShell({
           </SidebarContent>
         </Sidebar>
 
-        <SidebarInset>
+        <SidebarInset className="bg-transparent">
           <div className="md:hidden p-2">
             <SidebarTrigger />
           </div>
diff --git a/components/delete-buttons.tsx b/components/delete-buttons.tsx
index deb65f3..3ce651e 100644
--- a/components/delete-buttons.tsx
+++ b/components/delete-buttons.tsx
@@ -3,7 +3,7 @@
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Trash2, Loader2 } from "lucide-react";
-import { deleteForm } from "@/app/admin/form/actions";
+import { deleteForm } from "@/app/(ui)/admin/form/actions";
 import { deleteSubmission, deleteAllSubmissions } from "@/app/actions/submissions";
 import { toast } from "sonner";
 import { useRouter } from "next/navigation";
diff --git a/lib/share/ui-contracts.test.ts b/lib/share/ui-contracts.test.ts
index b6d9da8..26d5ab2 100644
--- a/lib/share/ui-contracts.test.ts
+++ b/lib/share/ui-contracts.test.ts
@@ -35,8 +35,8 @@ describe("share UI contracts", () => {
   test("keeps the extracted login dialog non-dismissible and shared", async () => {
     const [dialog, sharePage, formPage] = await Promise.all([
       Bun.file(new URL("../../components/login-dialog.tsx", import.meta.url)).text(),
-      Bun.file(new URL("../../app/share/page.tsx", import.meta.url)).text(),
-      Bun.file(new URL("../../app/form/[id]/page.tsx", import.meta.url)).text(),
+      Bun.file(new URL("../../app/(ui)/share/page.tsx", import.meta.url)).text(),
+      Bun.file(new URL("../../app/(ui)/form/[id]/page.tsx", import.meta.url)).text(),
     ]);
 
     expect(dialog).toContain("เข้าสู่ระบบก่อนกรอกแบบฟอร์ม");