diff --git a/app/admin/about/loading.tsx b/app/(admin)/about/loading.tsx
similarity index 100%
rename from app/admin/about/loading.tsx
rename to app/(admin)/about/loading.tsx
diff --git a/app/admin/about/page.tsx b/app/(admin)/about/page.tsx
similarity index 100%
rename from app/admin/about/page.tsx
rename to app/(admin)/about/page.tsx
diff --git a/app/admin/account/loading.tsx b/app/(admin)/account/loading.tsx
similarity index 100%
rename from app/admin/account/loading.tsx
rename to app/(admin)/account/loading.tsx
diff --git a/app/admin/account/page.tsx b/app/(admin)/account/page.tsx
similarity index 100%
rename from app/admin/account/page.tsx
rename to app/(admin)/account/page.tsx
diff --git a/app/admin/loading.tsx b/app/(admin)/dashboard/loading.tsx
similarity index 100%
rename from app/admin/loading.tsx
rename to app/(admin)/dashboard/loading.tsx
diff --git a/app/admin/page.tsx b/app/(admin)/dashboard/page.tsx
similarity index 95%
rename from app/admin/page.tsx
rename to app/(admin)/dashboard/page.tsx
index 6b05928..7ff79c4 100644
--- a/app/admin/page.tsx
+++ b/app/(admin)/dashboard/page.tsx
@@ -97,7 +97,7 @@ export default async function DashboardPage() {
         </h2>
         <div className='flex items-center'>
           <Button size='sm' asChild>
-            <Link href='/admin/portfolio/create'>Add project</Link>
+            <Link href='/portfolio/create'>Add project</Link>
           </Button>
         </div>
       </div>
@@ -138,7 +138,7 @@ export default async function DashboardPage() {
                 className='h-5 px-0'
                 asChild
               >
-                <Link href='/admin/qualification'>View all</Link>
+                <Link href='/qualification'>View all</Link>
               </Button>
             </CardTitle>
             <CardDescription>
@@ -159,7 +159,7 @@ export default async function DashboardPage() {
                 className='h-5 px-0'
                 asChild
               >
-                <Link href='/admin/portfolio'>View all</Link>
+                <Link href='/portfolio'>View all</Link>
               </Button>
             </CardTitle>
             <CardDescription>
diff --git a/app/admin/experience/loading.tsx b/app/(admin)/experience/loading.tsx
similarity index 100%
rename from app/admin/experience/loading.tsx
rename to app/(admin)/experience/loading.tsx
diff --git a/app/admin/experience/page.tsx b/app/(admin)/experience/page.tsx
similarity index 100%
rename from app/admin/experience/page.tsx
rename to app/(admin)/experience/page.tsx
diff --git a/app/admin/expertise/loading.tsx b/app/(admin)/expertise/loading.tsx
similarity index 100%
rename from app/admin/expertise/loading.tsx
rename to app/(admin)/expertise/loading.tsx
diff --git a/app/admin/expertise/page.tsx b/app/(admin)/expertise/page.tsx
similarity index 100%
rename from app/admin/expertise/page.tsx
rename to app/(admin)/expertise/page.tsx
diff --git a/app/admin/layout.tsx b/app/(admin)/layout.tsx
similarity index 100%
rename from app/admin/layout.tsx
rename to app/(admin)/layout.tsx
diff --git a/app/admin/miscellaneous/loading.tsx b/app/(admin)/miscellaneous/loading.tsx
similarity index 100%
rename from app/admin/miscellaneous/loading.tsx
rename to app/(admin)/miscellaneous/loading.tsx
diff --git a/app/admin/miscellaneous/page.tsx b/app/(admin)/miscellaneous/page.tsx
similarity index 100%
rename from app/admin/miscellaneous/page.tsx
rename to app/(admin)/miscellaneous/page.tsx
diff --git a/app/admin/portfolio/[portfolioId]/loading.tsx b/app/(admin)/portfolio/[portfolioId]/edit/loading.tsx
similarity index 98%
rename from app/admin/portfolio/[portfolioId]/loading.tsx
rename to app/(admin)/portfolio/[portfolioId]/edit/loading.tsx
index 32c6086..397be0a 100644
--- a/app/admin/portfolio/[portfolioId]/loading.tsx
+++ b/app/(admin)/portfolio/[portfolioId]/edit/loading.tsx
@@ -2,7 +2,7 @@ import { cn } from '@/lib/utils';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 
-export default function PortfolioIdLoading() {
+export default function EditPortfolioLoading() {
   return (
     <>
       <Skeleton className='h-9 w-[85px] mb-4' />
diff --git a/app/admin/portfolio/[portfolioId]/page.tsx b/app/(admin)/portfolio/[portfolioId]/edit/page.tsx
similarity index 92%
rename from app/admin/portfolio/[portfolioId]/page.tsx
rename to app/(admin)/portfolio/[portfolioId]/edit/page.tsx
index e2e395c..b1da1b7 100644
--- a/app/admin/portfolio/[portfolioId]/page.tsx
+++ b/app/(admin)/portfolio/[portfolioId]/edit/page.tsx
@@ -12,7 +12,7 @@ import {
   CardTitle
 } from '@/components/ui/card';
 
-export default async function PortfolioIdPage({
+export default async function EditPortfolioPage({
   params
 }: {
   params: { portfolioId: string };
@@ -35,7 +35,7 @@ export default async function PortfolioIdPage({
 
   return (
     <>
-      <BackButton slug='/admin/portfolio' />
+      <BackButton slug='/portfolio' />
       <Card className='rounded-lg border-none'>
         <CardHeader className='mx-[1px] pb-9'>
           <CardTitle className='text-xl font-semibold'>
diff --git a/app/admin/portfolio/create/loading.tsx b/app/(admin)/portfolio/create/loading.tsx
similarity index 98%
rename from app/admin/portfolio/create/loading.tsx
rename to app/(admin)/portfolio/create/loading.tsx
index 3d1cc8c..2970ea7 100644
--- a/app/admin/portfolio/create/loading.tsx
+++ b/app/(admin)/portfolio/create/loading.tsx
@@ -2,7 +2,7 @@ import { cn } from '@/lib/utils';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 
-export default function CreateLoading() {
+export default function CreatePortfolioLoading() {
   return (
     <>
       <Skeleton className='h-9 w-[85px] mb-4' />
diff --git a/app/admin/portfolio/create/page.tsx b/app/(admin)/portfolio/create/page.tsx
similarity index 88%
rename from app/admin/portfolio/create/page.tsx
rename to app/(admin)/portfolio/create/page.tsx
index c912250..8202308 100644
--- a/app/admin/portfolio/create/page.tsx
+++ b/app/(admin)/portfolio/create/page.tsx
@@ -8,10 +8,10 @@ import {
   CardTitle
 } from '@/components/ui/card';
 
-export default function CreatePage() {
+export default function CreatePortfolioPage() {
   return (
     <>
-      <BackButton slug='/admin/portfolio' />
+      <BackButton slug='/portfolio' />
       <Card className='rounded-lg border-none'>
         <CardHeader className='mx-[1px] pb-9'>
           <CardTitle className='text-xl font-semibold'>
diff --git a/app/admin/portfolio/loading.tsx b/app/(admin)/portfolio/loading.tsx
similarity index 100%
rename from app/admin/portfolio/loading.tsx
rename to app/(admin)/portfolio/loading.tsx
diff --git a/app/admin/portfolio/page.tsx b/app/(admin)/portfolio/page.tsx
similarity index 100%
rename from app/admin/portfolio/page.tsx
rename to app/(admin)/portfolio/page.tsx
diff --git a/app/admin/qualification/loading.tsx b/app/(admin)/qualification/loading.tsx
similarity index 100%
rename from app/admin/qualification/loading.tsx
rename to app/(admin)/qualification/loading.tsx
diff --git a/app/admin/qualification/page.tsx b/app/(admin)/qualification/page.tsx
similarity index 100%
rename from app/admin/qualification/page.tsx
rename to app/(admin)/qualification/page.tsx
diff --git a/app/admin/resume/loading.tsx b/app/(admin)/resume/loading.tsx
similarity index 100%
rename from app/admin/resume/loading.tsx
rename to app/(admin)/resume/loading.tsx
diff --git a/app/admin/resume/page.tsx b/app/(admin)/resume/page.tsx
similarity index 95%
rename from app/admin/resume/page.tsx
rename to app/(admin)/resume/page.tsx
index 8eea23d..5ae432d 100644
--- a/app/admin/resume/page.tsx
+++ b/app/(admin)/resume/page.tsx
@@ -12,7 +12,7 @@ import {
   CardTitle
 } from '@/components/ui/card';
 
-export default async function AboutPage() {
+export default async function ResumePage() {
   const user = await currentUser();
 
   if (!user || !user.id) {
diff --git a/app/admin/tool/[toolId]/loading.tsx b/app/(admin)/tool/[toolId]/edit/loading.tsx
similarity index 97%
rename from app/admin/tool/[toolId]/loading.tsx
rename to app/(admin)/tool/[toolId]/edit/loading.tsx
index fcf8ec2..c5eda8b 100644
--- a/app/admin/tool/[toolId]/loading.tsx
+++ b/app/(admin)/tool/[toolId]/edit/loading.tsx
@@ -1,7 +1,7 @@
 import { Skeleton } from '@/components/ui/skeleton';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 
-export default function ToolIdLoading() {
+export default function EditToolLoading() {
   return (
     <>
       <Skeleton className='h-9 w-[85px] mb-4' />
diff --git a/app/admin/tool/[toolId]/page.tsx b/app/(admin)/tool/[toolId]/edit/page.tsx
similarity index 93%
rename from app/admin/tool/[toolId]/page.tsx
rename to app/(admin)/tool/[toolId]/edit/page.tsx
index e44b311..cc1a07d 100644
--- a/app/admin/tool/[toolId]/page.tsx
+++ b/app/(admin)/tool/[toolId]/edit/page.tsx
@@ -12,7 +12,7 @@ import {
   CardTitle
 } from '@/components/ui/card';
 
-export default async function ToolId({
+export default async function EditToolPage({
   params
 }: {
   params: { toolId: string };
@@ -32,7 +32,7 @@ export default async function ToolId({
 
   return (
     <>
-      <BackButton slug='/admin/tool' />
+      <BackButton slug='/tool' />
       <Card className='rounded-lg border-none'>
         <CardHeader className='mx-[1px] pb-9'>
           <CardTitle className='text-xl font-semibold'>Edit Tool</CardTitle>
diff --git a/app/admin/tool/add/loading.tsx b/app/(admin)/tool/create/loading.tsx
similarity index 96%
rename from app/admin/tool/add/loading.tsx
rename to app/(admin)/tool/create/loading.tsx
index 196f1aa..5b93de1 100644
--- a/app/admin/tool/add/loading.tsx
+++ b/app/(admin)/tool/create/loading.tsx
@@ -1,7 +1,7 @@
 import { Skeleton } from '@/components/ui/skeleton';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 
-export default function AddLoading() {
+export default function CreateToolLoading() {
   return (
     <>
       <Skeleton className='h-9 w-[85px] mb-4' />
diff --git a/app/admin/tool/add/page.tsx b/app/(admin)/tool/create/page.tsx
similarity index 89%
rename from app/admin/tool/add/page.tsx
rename to app/(admin)/tool/create/page.tsx
index 5e5d229..fcf03c6 100644
--- a/app/admin/tool/add/page.tsx
+++ b/app/(admin)/tool/create/page.tsx
@@ -8,10 +8,10 @@ import {
   CardTitle
 } from '@/components/ui/card';
 
-export default function AddPage() {
+export default function CreateToolPage() {
   return (
     <>
-      <BackButton slug='/admin/tool' />
+      <BackButton slug='/tool' />
       <Card className='rounded-lg border-none'>
         <CardHeader className='mx-[1px] pb-9'>
           <CardTitle className='text-xl font-semibold'>Add Tool</CardTitle>
diff --git a/app/admin/tool/loading.tsx b/app/(admin)/tool/loading.tsx
similarity index 100%
rename from app/admin/tool/loading.tsx
rename to app/(admin)/tool/loading.tsx
diff --git a/app/admin/tool/page.tsx b/app/(admin)/tool/page.tsx
similarity index 100%
rename from app/admin/tool/page.tsx
rename to app/(admin)/tool/page.tsx
diff --git a/app/robots.ts b/app/robots.ts
index bcb0b44..191486a 100644
--- a/app/robots.ts
+++ b/app/robots.ts
@@ -11,7 +11,7 @@ export default function robots(): MetadataRoute.Robots {
     rules: {
       userAgent: '*',
       allow: ['/', '/auth/', '/privacy-policy', '/terms-and-conditions'],
-      disallow: ['/admin/', '/api/', '/download-cv']
+      disallow: ['/api/', '/download-cv']
     },
     sitemap: `${baseUrl}/sitemap.xml`
   };
diff --git a/components/admin/menu.tsx b/components/admin/menu.tsx
index 0175c06..98cd211 100644
--- a/components/admin/menu.tsx
+++ b/components/admin/menu.tsx
@@ -5,25 +5,25 @@ import { signOut } from 'next-auth/react';
 import { usePathname } from 'next/navigation';
 import {
   Book,
-  ClipboardCheck,
+  User,
+  List,
+  Text,
+  LogOut,
   FileText,
   FolderGit2,
-  GraduationCap,
   LayoutGrid,
-  List,
-  LogOut,
-  TerminalSquare,
-  Text,
-  User
+  GraduationCap,
+  ClipboardCheck,
+  TerminalSquare
 } from 'lucide-react';
 
 import { cn } from '@/lib/utils';
 import { Button } from '@/components/ui/button';
 import {
   Tooltip,
+  TooltipTrigger,
   TooltipContent,
-  TooltipProvider,
-  TooltipTrigger
+  TooltipProvider
 } from '@/components/ui/tooltip';
 
 interface MenuProps {
@@ -35,63 +35,63 @@ export default function Menu({ isOpen }: MenuProps) {
 
   const routes = [
     {
-      href: '/admin',
+      href: '/dashboard',
       label: 'Dashboard',
-      active: pathname === '/admin',
+      active: pathname.includes('/dashboard'),
       icon: <LayoutGrid size={18} />
     },
     {
-      href: '/admin/about',
+      href: '/about',
       label: 'About',
-      active: pathname.includes('/admin/about'),
+      active: pathname.includes('/about'),
       icon: <Text size={18} />
     },
     {
-      href: '/admin/experience',
+      href: '/experience',
       label: 'Experience',
-      active: pathname.includes('/admin/experience'),
+      active: pathname.includes('/experience'),
       icon: <Book size={18} />
     },
     {
-      href: '/admin/expertise',
+      href: '/expertise',
       label: 'Expertise',
-      active: pathname.includes('/admin/expertise'),
+      active: pathname.includes('/expertise'),
       icon: <ClipboardCheck size={18} />
     },
     {
-      href: '/admin/qualification',
+      href: '/qualification',
       label: 'Qualification',
-      active: pathname.includes('/admin/qualification'),
+      active: pathname.includes('/qualification'),
       icon: <GraduationCap size={20} />
     },
     {
-      href: '/admin/portfolio',
+      href: '/portfolio',
       label: 'Portfolio',
-      active: pathname.includes('/admin/portfolio'),
+      active: pathname.includes('/portfolio'),
       icon: <FolderGit2 size={18} />
     },
     {
-      href: '/admin/miscellaneous',
+      href: '/miscellaneous',
       label: 'Miscellaneous',
-      active: pathname.includes('/admin/miscellaneous'),
+      active: pathname.includes('/miscellaneous'),
       icon: <List size={18} />
     },
     {
-      href: '/admin/tool',
+      href: '/tool',
       label: 'Tool & Apps',
-      active: pathname.includes('/admin/tool'),
+      active: pathname.includes('/tool'),
       icon: <TerminalSquare size={18} />
     },
     {
-      href: '/admin/resume',
+      href: '/resume',
       label: 'Resume',
-      active: pathname.includes('/admin/resume'),
+      active: pathname.includes('/resume'),
       icon: <FileText size={18} />
     },
     {
-      href: '/admin/account',
+      href: '/account',
       label: 'Account',
-      active: pathname.includes('/admin/account'),
+      active: pathname.includes('/account'),
       icon: <User size={18} />
     }
   ];
diff --git a/components/admin/page-title.tsx b/components/admin/page-title.tsx
index a6734a4..22fcdf8 100644
--- a/components/admin/page-title.tsx
+++ b/components/admin/page-title.tsx
@@ -7,25 +7,25 @@ export default function PageTitle() {
 
   let pageTitle = '';
 
-  if (pathname === '/admin') {
+  if (pathname === '/dashboard') {
     pageTitle = 'Dashboard';
-  } else if (pathname.includes('/admin/about')) {
+  } else if (pathname.includes('/about')) {
     pageTitle = 'About';
-  } else if (pathname.includes('/admin/experience')) {
+  } else if (pathname.includes('/experience')) {
     pageTitle = 'Experience';
-  } else if (pathname.includes('/admin/expertise')) {
+  } else if (pathname.includes('/expertise')) {
     pageTitle = 'Expertise';
-  } else if (pathname.includes('/admin/qualification')) {
+  } else if (pathname.includes('/qualification')) {
     pageTitle = 'Qualification';
-  } else if (pathname.includes('/admin/portfolio')) {
+  } else if (pathname.includes('/portfolio')) {
     pageTitle = 'Portfolio';
-  } else if (pathname.includes('/admin/miscellaneous')) {
+  } else if (pathname.includes('/miscellaneous')) {
     pageTitle = 'Miscellaneous';
-  } else if (pathname.includes('/admin/tool')) {
+  } else if (pathname.includes('/tool')) {
     pageTitle = 'Tool & Apps';
-  } else if (pathname.includes('/admin/resume')) {
+  } else if (pathname.includes('/resume')) {
     pageTitle = 'Resume';
-  } else if (pathname.includes('/admin/account')) {
+  } else if (pathname.includes('/account')) {
     pageTitle = 'Account';
   }
 
diff --git a/components/admin/portfolio-form.tsx b/components/admin/portfolio-form.tsx
index f4a683b..5db3631 100644
--- a/components/admin/portfolio-form.tsx
+++ b/components/admin/portfolio-form.tsx
@@ -124,7 +124,7 @@ export default function PortfolioForm({ portfolio }: PortfolioFormProps) {
             title: 'Success!',
             description: 'Data has been successfully saved.'
           });
-          router.push(response.data.portfolio.id);
+          router.push(`/portfolio/${response.data.portfolio.id}/edit`);
         }
       } else {
         const response = await axios.post('/api/portfolio', newValues);
@@ -135,7 +135,7 @@ export default function PortfolioForm({ portfolio }: PortfolioFormProps) {
             title: 'Success!',
             description: 'Data has been successfully saved.'
           });
-          router.push(response.data.portfolio.id);
+          router.push(`/portfolio/${response.data.portfolio.id}/edit`);
         }
       }
     } catch (error) {
diff --git a/components/admin/portfolio-table/add-button.tsx b/components/admin/portfolio-table/add-button.tsx
index 82517f9..88223d2 100644
--- a/components/admin/portfolio-table/add-button.tsx
+++ b/components/admin/portfolio-table/add-button.tsx
@@ -8,7 +8,7 @@ import { Button } from '@/components/ui/button';
 export default function AddButton() {
   return (
     <Button size='sm' className='h-8' asChild>
-      <Link href='/admin/portfolio/create'>
+      <Link href='/portfolio/create'>
         <PlusCircle size={16} className='mr-2' />
         Create
       </Link>
diff --git a/components/admin/portfolio-table/cell-actions.tsx b/components/admin/portfolio-table/cell-actions.tsx
index aa41329..da0a1e3 100644
--- a/components/admin/portfolio-table/cell-actions.tsx
+++ b/components/admin/portfolio-table/cell-actions.tsx
@@ -101,7 +101,7 @@ export function CellActions<TData>({ row }: CellActionsProps<TData>) {
         </DropdownMenuTrigger>
         <DropdownMenuContent align='end'>
           <DropdownMenuItem className='hover:cursor-pointer' asChild>
-            <Link href={`/admin/portfolio/${portfolio.id}`}>
+            <Link href={`/portfolio/${portfolio.id}/edit`}>
               <Edit className='mr-2' size={14} />
               Edit
             </Link>
diff --git a/components/admin/recent-project.tsx b/components/admin/recent-project.tsx
index 021e0c5..4d544e8 100644
--- a/components/admin/recent-project.tsx
+++ b/components/admin/recent-project.tsx
@@ -47,7 +47,7 @@ export default function RecentProject({ projects }: RecentProjectProps) {
           </div>
           <div>
             <Button size='sm' asChild>
-              <Link href={`/admin/portfolio/${project.id}`}>View</Link>
+              <Link href={`/portfolio/${project.id}/edit`}>View</Link>
             </Button>
           </div>
         </div>
diff --git a/components/admin/sheet-menu.tsx b/components/admin/sheet-menu.tsx
index ca111b6..b600baa 100644
--- a/components/admin/sheet-menu.tsx
+++ b/components/admin/sheet-menu.tsx
@@ -25,7 +25,7 @@ export default function SheetMenu() {
             variant='link'
             asChild
           >
-            <Link href='/admin' className='flex items-center gap-2'>
+            <Link href='/dashboard' className='flex items-center gap-2'>
               <LayoutTemplate />
               <h1 className='font-bold text-lg'>Profolio</h1>
             </Link>
diff --git a/components/admin/sidebar.tsx b/components/admin/sidebar.tsx
index cb0d3f8..9cdf3f2 100644
--- a/components/admin/sidebar.tsx
+++ b/components/admin/sidebar.tsx
@@ -28,7 +28,7 @@ export default function Sidebar() {
           variant='link'
           asChild
         >
-          <Link href='/admin' className='flex items-center gap-2'>
+          <Link href='/dashboard' className='flex items-center gap-2'>
             <LayoutTemplate />
             <h1
               className={cn(
diff --git a/components/admin/tool-form.tsx b/components/admin/tool-form.tsx
index 4c5a002..ca9ff63 100644
--- a/components/admin/tool-form.tsx
+++ b/components/admin/tool-form.tsx
@@ -92,7 +92,7 @@ export default function ToolForm({ tool }: ToolFormProps) {
             title: 'Success!',
             description: 'Data has been successfully saved.'
           });
-          router.push(response.data.tool.id);
+          router.push(`/tool/${response.data.tool.id}/edit`);
         }
       } else {
         const response = await axios.post('/api/tool', newValues);
@@ -103,7 +103,7 @@ export default function ToolForm({ tool }: ToolFormProps) {
             title: 'Success!',
             description: 'Data has been successfully saved.'
           });
-          router.push(response.data.tool.id);
+          router.push(`/tool/${response.data.tool.id}/edit`);
         }
       }
     } catch (error) {
diff --git a/components/admin/tool-table/add-button.tsx b/components/admin/tool-table/add-button.tsx
index 1feb401..49ae38b 100644
--- a/components/admin/tool-table/add-button.tsx
+++ b/components/admin/tool-table/add-button.tsx
@@ -8,7 +8,7 @@ import { Button } from '@/components/ui/button';
 export default function AddButton() {
   return (
     <Button size='sm' className='h-8' asChild>
-      <Link href='/admin/tool/add'>
+      <Link href='/tool/create'>
         <PlusCircle size={16} className='mr-2' />
         Add
       </Link>
diff --git a/components/admin/tool-table/cell-actions.tsx b/components/admin/tool-table/cell-actions.tsx
index a5c86fe..151f67a 100644
--- a/components/admin/tool-table/cell-actions.tsx
+++ b/components/admin/tool-table/cell-actions.tsx
@@ -99,7 +99,7 @@ export function CellActions<TData>({ row }: CellActionsProps<TData>) {
         </DropdownMenuTrigger>
         <DropdownMenuContent align='end'>
           <DropdownMenuItem className='hover:cursor-pointer' asChild>
-            <Link href={`/admin/tool/${tool.id}`}>
+            <Link href={`/tool/${tool.id}/edit`}>
               <Edit className='mr-2' size={14} />
               Edit
             </Link>
diff --git a/components/admin/user-nav.tsx b/components/admin/user-nav.tsx
index bb930ea..ef1d9bb 100644
--- a/components/admin/user-nav.tsx
+++ b/components/admin/user-nav.tsx
@@ -61,13 +61,13 @@ export default function UserNav() {
         <DropdownMenuSeparator />
         <DropdownMenuGroup>
           <DropdownMenuItem className='hover:cursor-pointer' asChild>
-            <Link href='/admin' className='flex items-center'>
+            <Link href='/dashboard' className='flex items-center'>
               <LayoutGrid className='w-4 h-4 mr-3 text-muted-foreground' />
               Dashboard
             </Link>
           </DropdownMenuItem>
           <DropdownMenuItem className='hover:cursor-pointer' asChild>
-            <Link href='/admin/account' className='flex items-center'>
+            <Link href='/account' className='flex items-center'>
               <User className='w-4 h-4 mr-3 text-muted-foreground' />
               Account
             </Link>
diff --git a/components/auth/sign-up-form.tsx b/components/auth/sign-up-form.tsx
index 2a323d5..96452d0 100644
--- a/components/auth/sign-up-form.tsx
+++ b/components/auth/sign-up-form.tsx
@@ -61,7 +61,7 @@ export default function SignUpForm() {
         await signIn('credentials', {
           email: values.email,
           password: values.password,
-          callbackUrl: '/admin'
+          callbackUrl: '/dashboard'
         });
       }
     } catch (error) {
diff --git a/routes.ts b/routes.ts
index b5a990a..a2b9120 100644
--- a/routes.ts
+++ b/routes.ts
@@ -16,7 +16,7 @@ export const publicRoutes: string[] = [
 
 /**
  * An array of routes that are used for authentication
- * These routes will redirect signed in users to /admin
+ * These routes will redirect signed in users to /dashboard
  * @type {string[]}
  */
 export const authRoutes: string[] = ['/auth/sign-in', '/auth/sign-up'];
@@ -32,4 +32,4 @@ export const apiAuthPrefix: string = '/api/auth';
  * The default redirect path after signing in
  * @type {string}
  */
-export const DEFAULT_SIGNIN_REDIRECT: string = '/admin';
+export const DEFAULT_SIGNIN_REDIRECT: string = '/dashboard';