diff --git a/src/frontend/components/ErrorDataTable.tsx b/src/frontend/components/ErrorDataTable.tsx
index 34d7924..d543e93 100644
--- a/src/frontend/components/ErrorDataTable.tsx
+++ b/src/frontend/components/ErrorDataTable.tsx
@@ -15,6 +15,7 @@ import {
 } from '@mantine/core'
 import { useDisclosure } from '@mantine/hooks'
 import { useState } from 'react'
+import { Link } from '@tanstack/react-router'
 import { TbMessageReport, TbHistory, TbExternalLink, TbBug } from 'react-icons/tb'
 
 const mockErrors = [
@@ -85,7 +86,7 @@ export function ErrorDataTable() {
               </ThemeIcon>
               <Text fw={700}>LATEST ERROR REPORTS</Text>
             </Group>
-            <Button variant="subtle" size="compact-xs" color="blue" rightSection={<TbExternalLink size={14} />}>
+            <Button component={Link} to='/apps/desa-plus/errors' variant="subtle" size="compact-xs" color="blue" rightSection={<TbExternalLink size={14} />}>
               View All Reports
             </Button>
           </Group>
diff --git a/src/frontend/config/appMenus.ts b/src/frontend/config/appMenus.ts
index ae77749..2af209b 100644
--- a/src/frontend/config/appMenus.ts
+++ b/src/frontend/config/appMenus.ts
@@ -1,5 +1,5 @@
 import { IconType } from 'react-icons'
-import { TbChartBar, TbHistory, TbAlertTriangle, TbSettings, TbShoppingCart, TbPackage, TbCreditCard } from 'react-icons/tb'
+import { TbChartBar, TbHistory, TbAlertTriangle, TbSettings, TbShoppingCart, TbPackage, TbCreditCard, TbBuilding } from 'react-icons/tb'
 
 export interface MenuItem {
   value: string
@@ -22,7 +22,7 @@ export const APP_CONFIGS: Record<string, AppConfig> = {
       { value: 'overview', label: 'Overview', icon: TbChartBar, to: '/apps/desa-plus' },
       { value: 'logs', label: 'Log Activity', icon: TbHistory, to: '/apps/desa-plus/logs' },
       { value: 'errors', label: 'Error Reports', icon: TbAlertTriangle, to: '/apps/desa-plus/errors' },
-      { value: 'manage', label: 'Manage', icon: TbSettings, to: '/apps/desa-plus/manage' },
+      { value: 'villages', label: 'Villages', icon: TbBuilding, to: '/apps/desa-plus/villages' },
     ],
   },
   'e-commerce': {
diff --git a/src/frontend/routes/apps.$appId.index.tsx b/src/frontend/routes/apps.$appId.index.tsx
index a206fd1..47f7525 100644
--- a/src/frontend/routes/apps.$appId.index.tsx
+++ b/src/frontend/routes/apps.$appId.index.tsx
@@ -1,36 +1,22 @@
+import { VillageActivityLineChart, VillageComparisonBarChart } from '@/frontend/components/DashboardCharts'
+import { ErrorDataTable } from '@/frontend/components/ErrorDataTable'
+import { SummaryCard } from '@/frontend/components/SummaryCard'
 import {
-  Badge,
-  Button,
-  Card,
+  ActionIcon,
   Group,
   SimpleGrid,
   Stack,
   Text,
-  Title,
-  Paper,
-  Box,
-  ThemeIcon,
-  Select,
-  ActionIcon,
-  Container,
-  Divider,
+  Title
 } from '@mantine/core'
-import { createFileRoute, Link, useParams } from '@tanstack/react-router'
-import { 
-  TbUsers, 
-  TbActivity, 
-  TbRefresh, 
-  TbAlertTriangle, 
-  TbCalendar, 
-  TbFilter, 
-  TbChevronRight, 
-  TbArrowUpRight,
+import { createFileRoute, useParams } from '@tanstack/react-router'
+import {
+  TbActivity,
+  TbAlertTriangle,
   TbBuildingCommunity,
+  TbRefresh,
   TbVersions
 } from 'react-icons/tb'
-import { SummaryCard } from '@/frontend/components/SummaryCard'
-import { VillageActivityLineChart, VillageComparisonBarChart } from '@/frontend/components/DashboardCharts'
-import { ErrorDataTable } from '@/frontend/components/ErrorDataTable'
 
 export const Route = createFileRoute('/apps/$appId/')({
   component: AppOverviewPage,
@@ -43,66 +29,59 @@ function AppOverviewPage() {
   return (
     <Stack gap="xl">
       {/* 🔝 HEADER SECTION */}
-      <Paper withBorder p="lg" radius="2xl" className="glass">
-        <Group justify="space-between">
-          <Stack gap={0}>
-            <Title order={2} className="gradient-text" style={{ fontSize: '1.8rem' }}>Overview</Title>
-            <Group gap="xs" mt={4}>
-              <Badge variant="light" size="lg" radius="sm" color="brand-blue" leftSection={<TbBuildingCommunity size={14} />}>
-                APP: {isDesaPlus ? 'DESA+' : appId.toUpperCase()}
-              </Badge>
-              <Text size="xs" c="dimmed" fw={600}>LAST UPDATED: JUST NOW</Text>
-            </Group>
-          </Stack>
+      {/* <Paper withBorder p="lg" radius="2xl" className="glass"> */}
+      <Group justify="space-between">
+        <Stack gap={0}>
+          <Title order={3}>Overview</Title>
+          <Text size="sm" c="dimmed">Last updated: Just now</Text>
+        </Stack>
 
-          <Group gap="md">
-            <Select
+        <Group gap="md">
+          {/* <Select
                 placeholder="Date Range"
                 data={['Today', '7 Days', '30 Days']}
                 defaultValue="Today"
                 leftSection={<TbCalendar size={16} />}
                 radius="md"
                 w={140}
-            />
-            <ActionIcon variant="light" color="brand-blue" size="lg" radius="md">
-                <TbRefresh size={20} />
-            </ActionIcon>
-            <Button 
+            /> */}
+          <ActionIcon variant="light" color="brand-blue" size="lg" radius="md">
+            <TbRefresh size={20} />
+          </ActionIcon>
+          {/* <Button 
                 variant="gradient" 
                 gradient={{ from: '#2563EB', to: '#7C3AED' }} 
                 radius="md"
                 leftSection={<TbFilter size={18} />}
             >
                 Add Filter
-            </Button>
-          </Group>
+            </Button> */}
         </Group>
-      </Paper>
+      </Group>
+      {/* </Paper> */}
 
       {/* 📊 1. SUMMARY CARDS */}
       <SimpleGrid cols={{ base: 1, sm: 2, lg: 4 }} spacing="lg">
-        <SummaryCard 
+        <SummaryCard
           title="Active Version"
           value="v1.2.0"
           icon={TbVersions}
           color="brand-blue"
-          progress={{ value: 92, label: 'User Adoption' }}
         />
-        <SummaryCard 
+        <SummaryCard
           title="Total Activity Today"
           value="3,842"
           icon={TbActivity}
           color="teal"
           trend={{ value: '14.2%', positive: true }}
         />
-        <SummaryCard 
+        <SummaryCard
           title="Total Villages Active"
           value="138"
           icon={TbBuildingCommunity}
           color="indigo"
-          progress={{ value: 98, label: 'Integration Health' }}
         />
-        <SummaryCard 
+        <SummaryCard
           title="Errors Today"
           value="12"
           icon={TbAlertTriangle}
diff --git a/src/frontend/routes/apps.$appId.tsx b/src/frontend/routes/apps.$appId.tsx
index 09300a1..1363811 100644
--- a/src/frontend/routes/apps.$appId.tsx
+++ b/src/frontend/routes/apps.$appId.tsx
@@ -2,6 +2,7 @@ import { DashboardLayout } from '@/frontend/components/DashboardLayout'
 import {
   Box,
   Container,
+  Divider,
   Group,
   Stack,
   Text,
@@ -27,7 +28,7 @@ function AppDetailLayout() {
   return (
     <DashboardLayout>
       <Container size="xl" py="lg">
-        <Stack gap="xl">
+        <Stack gap="md">
           <Group justify="space-between" align="flex-end">
             <Stack gap={4}>
               <Title order={1} className="gradient-text" style={{ fontSize: '2.5rem' }}>{appName}</Title>
@@ -35,7 +36,9 @@ function AppDetailLayout() {
             </Stack>
           </Group>
 
-          <Box mt="md">
+          <Divider />
+
+          <Box>
             <Outlet />
           </Box>
         </Stack>
diff --git a/src/frontend/routes/apps.$appId.manage.tsx b/src/frontend/routes/apps.$appId.villages.tsx
similarity index 98%
rename from src/frontend/routes/apps.$appId.manage.tsx
rename to src/frontend/routes/apps.$appId.villages.tsx
index 1dfb05c..ef065c6 100644
--- a/src/frontend/routes/apps.$appId.manage.tsx
+++ b/src/frontend/routes/apps.$appId.villages.tsx
@@ -34,8 +34,8 @@ import {
 } from 'react-icons/tb'
 import { StatsCard } from '@/frontend/components/StatsCard'
 
-export const Route = createFileRoute('/apps/$appId/manage')({
-  component: AppManagePage,
+export const Route = createFileRoute('/apps/$appId/villages')({
+  component: AppVillagesPage,
 })
 
 const mockDevelopers = [
@@ -45,7 +45,7 @@ const mockDevelopers = [
   { value: 'rahmat', label: 'Rahmat Hidayat', avatar: null },
 ]
 
-function AppManagePage() {
+function AppVillagesPage() {
   const { appId } = useParams({ from: '/apps/$appId' })
   const [initModalOpened, { open: openInit, close: closeInit }] = useDisclosure(false)
   const [assignModalOpened, { open: openAssign, close: closeAssign }] = useDisclosure(false)