diff --git a/src/app/admin/overview/page.tsx b/src/app/admin/overview/page.tsx
index 44aaee8..d5e3ab9 100644
--- a/src/app/admin/overview/page.tsx
+++ b/src/app/admin/overview/page.tsx
@@ -1,4 +1,31 @@
 "use client";
+
+import PageContainer from "@/components/layout/page-container";
+import { buttonVariants } from "@/components/ui/button";
+import { Heading } from "@/components/ui/heading";
+import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
+import { IconPlus } from "@tabler/icons-react";
+import Link from "next/link";
+
 export default function Page() {
-  return <main>xx</main>;
+  return (
+    <PageContainer>
+      <div className="flex flex-1 flex-col space-y-4">
+        <div className="flex items-start justify-between">
+          <Heading
+            title="Admin"
+            description="Manage (Server side table functionalities.)"
+          />
+          <Link
+            href="/dashboard/product/new"
+            className={cn(buttonVariants(), "text-xs md:text-sm")}
+          >
+            <IconPlus className="mr-2 h-4 w-4" /> Add New
+          </Link>
+        </div>
+        <Separator />
+      </div>
+    </PageContainer>
+  );
 }
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index 2ad13db..24debc2 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -1,34 +1,30 @@
-'use client';
+"use client";
 
-import { useRouter } from 'next/navigation';
-
-import { Button } from '@/components/ui/button';
+import { useRouter } from "next/navigation";
+import { Button } from "@/components/ui/button";
 
 export default function NotFound() {
   const router = useRouter();
 
   return (
-    <div className='absolute top-1/2 left-1/2 mb-16 -translate-x-1/2 -translate-y-1/2 items-center justify-center text-center'>
-      <span className='from-foreground bg-linear-to-b to-transparent bg-clip-text text-[10rem] leading-none font-extrabold text-transparent'>
+    <div className="absolute top-1/2 left-1/2 mb-16 -translate-x-1/2 -translate-y-1/2 items-center justify-center text-center">
+      <span className="from-foreground bg-linear-to-b to-transparent bg-clip-text text-[10rem] leading-none font-extrabold text-transparent">
         404
       </span>
-      <h2 className='font-heading my-2 text-2xl font-bold'>
-        Something&apos;s missing
+
+      <h2 className="font-heading my-2 text-2xl font-bold">
+        ไม่พบหน้าที่คุณต้องการ
       </h2>
-      <p>
-        Sorry, the page you are looking for doesn&apos;t exist or has been
-        moved.
-      </p>
-      <div className='mt-8 flex justify-center gap-2'>
-        <Button onClick={() => router.back()} variant='default' size='lg'>
-          Go back
+
+      <p>ขออภัย ไม่พบหน้าที่คุณกำลังค้นหา หรือหน้านี้อาจถูกย้ายไปแล้ว</p>
+
+      <div className="mt-8 flex justify-center gap-2">
+        <Button onClick={() => router.back()} variant="default" size="lg">
+          ย้อนกลับ
         </Button>
-        <Button
-          onClick={() => router.push('/dashboard')}
-          variant='ghost'
-          size='lg'
-        >
-          Back to Home
+
+        <Button onClick={() => router.push("/")} variant="ghost" size="lg">
+          กลับสู่หน้าหลัก
         </Button>
       </div>
     </div>