From a00481152c45014be00bc42ddac0bc68fd9e01bb Mon Sep 17 00:00:00 2001
From: nico <nicoarya20@gmail.com>
Date: Thu, 11 Dec 2025 17:58:03 +0800
Subject: [PATCH] Fix Konsisten teks di tampilan mobile dan desktop Fix QC Kak
 Inno tgl 10 Des Fix QC Kak Ayu tgl 10 Des

---
 .../desa/berita/[kategori]/Content.tsx        | 100 +++-
 .../desa/berita/[kategori]/[id]/page.tsx      |  66 +--
 .../(pages)/desa/berita/semua/page.tsx        |  51 +-
 .../(pages)/desa/galery/foto/Content.tsx      |   0
 .../(pages)/desa/galery/foto/page.tsx         |  67 +--
 .../(pages)/desa/galery/video/Content.tsx     | 109 +++--
 .../(pages)/desa/galery/video/[id]/page.tsx   |  40 +-
 .../_com/pelayananPendudukNonPermanent.tsx    |  28 +-
 .../_com/pelayananPerizinanBerusaha.tsx       |  42 +-
 .../layanan/_com/pelayananSuratKeterangan.tsx |  18 +-
 .../_com/pelayananTelunjukSaktiDesa.tsx       |  17 +-
 .../desa/pengumuman/[name]/[id]/page.tsx      |  88 +++-
 .../(pages)/desa/pengumuman/[name]/page.tsx   |  84 +++-
 .../(pages)/desa/pengumuman/page.tsx          |  67 +--
 .../(pages)/desa/potensi/[id]/page.tsx        |  36 +-
 .../darmasaba/(pages)/desa/potensi/page.tsx   |  79 ++-
 .../struktur-perangkat-desa/[id]/page.tsx     |  40 +-
 .../profil/struktur-perangkat-desa/page.tsx   |  75 +--
 .../(pages)/desa/profil/ui/lambangDesa.tsx    |  36 +-
 .../(pages)/desa/profil/ui/maskotDesa.tsx     |  85 ++--
 .../(pages)/desa/profil/ui/motoDesa.tsx       |  73 ++-
 .../(pages)/desa/profil/ui/profilPerbekel.tsx |  82 ++--
 .../(pages)/desa/profil/ui/sejarahDesa.tsx    |  25 +-
 .../(pages)/desa/profil/ui/semuaPerbekel.tsx  |  53 +-
 .../(pages)/desa/profil/ui/visimisiDesa.tsx   |  43 +-
 .../PADesa-pendapatan-asli-desa/page.tsx      | 351 ++++++++------
 .../(pages)/ekonomi/pasar-desa/page.tsx       | 126 ++---
 .../ekonomi/program-kemiskinan/page.tsx       |  70 ++-
 .../page.tsx                                  | 453 ++++++++++++------
 .../page.tsx                                  |   2 +-
 .../keamanan/laporan-publik/[id]/page.tsx     |  12 +-
 .../(pages)/keamanan/tips-keamanan/page.tsx   | 123 +++--
 .../artikel-kesehatan-page/page.tsx           |   7 +-
 .../fasilitas-kesehatan-page/page.tsx         |  34 +-
 .../kesehatan/data-kesehatan-warga/page.tsx   |  77 +--
 .../info-wabah-penyakit/[id]/page.tsx         |  25 +-
 .../(pages)/kesehatan/posyandu/[id]/page.tsx  |  39 +-
 .../(pages)/kesehatan/posyandu/page.tsx       |  41 +-
 .../(pages)/ppid/struktur-ppid/page.tsx       |   2 +-
 .../darmasaba/(tambahan)/penghargaan/page.tsx |  32 +-
 src/app/darmasaba/_com/NavbarMainMenu.tsx     |   2 +-
 .../_com/main-page/potensi/index.tsx          |   2 +-
 src/app/darmasaba/_com/searchUrl.tsx          |  16 +-
 43 files changed, 1725 insertions(+), 1093 deletions(-)
 delete mode 100644 src/app/darmasaba/(pages)/desa/galery/foto/Content.tsx

diff --git a/src/app/darmasaba/(pages)/desa/berita/[kategori]/Content.tsx b/src/app/darmasaba/(pages)/desa/berita/[kategori]/Content.tsx
index 8871dc52..5e0b73e0 100644
--- a/src/app/darmasaba/(pages)/desa/berita/[kategori]/Content.tsx
+++ b/src/app/darmasaba/(pages)/desa/berita/[kategori]/Content.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import stateDashboardBerita from '@/app/admin/(dashboard)/_state/desa/berita';
 import {
   Badge,
@@ -51,10 +51,14 @@ export default function Content({ kategori }: { kategori: string }) {
       <Container size="xl" px={{ base: 'md', md: 'xl' }}>
         {/* === Berita Utama === */}
         {featuredState.loading ? (
-          <Center><Skeleton h={400} /></Center>
+          <Center>
+            <Skeleton h={400} />
+          </Center>
         ) : featured ? (
           <Box mb={50}>
-            <Text fz="h2" fw={700} mb="md">Berita Utama</Text>
+            <Title order={2} mb="md">
+              Berita Utama
+            </Title>
             <Paper shadow="md" radius="md" withBorder>
               <Grid gutter={0}>
                 <GridCol span={{ base: 12, md: 6 }}>
@@ -74,13 +78,29 @@ export default function Content({ kategori }: { kategori: string }) {
                       <Badge color="blue" variant="light" mb="md">
                         {featured.kategoriBerita?.name || kategori}
                       </Badge>
-                      <Title order={2} mb="md">{featured.judul}</Title>
-                      <Text c="dimmed" lineClamp={3} mb="md" dangerouslySetInnerHTML={{ __html: featured.deskripsi }} />
+                      <Title order={3} mb="md">
+                        {featured.judul}
+                      </Title>
+                      <Text
+                        c="dimmed"
+                        lineClamp={3}
+                        mb="md"
+                        style={{ lineHeight: 1.6 }}
+                        dangerouslySetInnerHTML={{ __html: featured.deskripsi }}
+                      />
                     </div>
                     <Group justify="apart" mt="auto">
                       <Group gap="xs">
                         <IconCalendar size={18} />
-                        <Text size="sm">
+                        <Text
+                          fz={{ base: 'xs', md: 'sm' }}
+                          c="dimmed"
+                          lh={1.5}
+                          style={{
+                            fontSize: '0.875rem',
+                            lineHeight: '1.5rem',
+                          }}
+                        >
                           {new Date(featured.createdAt).toLocaleDateString('id-ID', {
                             day: 'numeric',
                             month: 'long',
@@ -91,7 +111,9 @@ export default function Content({ kategori }: { kategori: string }) {
                       <Button
                         variant="light"
                         rightSection={<IconArrowRight size={16} />}
-                        onClick={() => router.push(`/darmasaba/desa/berita/${kategori}/${featured.id}`)}
+                        onClick={() =>
+                          router.push(`/darmasaba/desa/berita/${kategori}/${featured.id}`)
+                        }
                       >
                         Baca Selengkapnya
                       </Button>
@@ -105,19 +127,29 @@ export default function Content({ kategori }: { kategori: string }) {
 
         {/* === Daftar Berita === */}
         <Box mt={50}>
-          <Title order={2} mb="md">Daftar Berita</Title>
+          <Title order={2} mb="md">
+            Daftar Berita
+          </Title>
           <Divider mb="xl" />
 
           {state.findMany.loading ? (
             <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl">
-              {Array(3).fill(0).map((_, i) => (
-                <Skeleton key={i} h={300} radius="md" />
-              ))}
+              {Array(3)
+                .fill(0)
+                .map((_, i) => (
+                  <Skeleton key={i} h={300} radius="md" />
+                ))}
             </SimpleGrid>
           ) : paginatedNews.length === 0 ? (
-            <Text c="dimmed" ta="center">Belum ada berita di kategori &quot;{kategori}&quot;.</Text>
+            <Text c="dimmed" ta="center" fz={{ base: 'sm', md: 'md' }} lh={1.5}>
+              Belum ada berita di kategori &quot;{kategori}&quot;.
+            </Text>
           ) : (
-            <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl" verticalSpacing="xl">
+            <SimpleGrid
+              cols={{ base: 1, sm: 2, lg: 3 }}
+              spacing="xl"
+              verticalSpacing="xl"
+            >
               {paginatedNews.map((item) => (
                 <Card
                   key={item.id}
@@ -125,19 +157,51 @@ export default function Content({ kategori }: { kategori: string }) {
                   p="lg"
                   radius="md"
                   withBorder
-                  onClick={() => router.push(`/darmasaba/desa/berita/${kategori}/${item.id}`)}
+                  onClick={() =>
+                    router.push(`/darmasaba/desa/berita/${kategori}/${item.id}`)
+                  }
                   style={{ cursor: 'pointer' }}
                 >
                   <Card.Section>
-                    <Image src={item.image?.link} height={200} alt={item.judul} fit="cover" loading="lazy"/>
+                    <Image
+                      src={item.image?.link}
+                      height={200}
+                      alt={item.judul}
+                      fit="cover"
+                      loading="lazy"
+                    />
                   </Card.Section>
                   <Badge color="blue" variant="light" mt="md">
                     {item.kategoriBerita?.name || kategori}
                   </Badge>
-                  <Text fw={600} size="lg" mt="sm" lineClamp={2}>{item.judul}</Text>
-                  <Text size="sm" c="dimmed" lineClamp={3} style={{wordBreak: "break-word", whiteSpace: "normal"}} mt="xs" dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                  <Title
+                    order={4}
+                    mt="sm"
+                    fz={{ base: 'sm', md: 'md' }}
+                    style={{ lineHeight: 1.4 }}
+                    lineClamp={2}
+                  >
+                    {item.judul}
+                  </Title>
+                  <Text
+                    fz={{ base: 'xs', md: 'sm' }}
+                    c="dimmed"
+                    lineClamp={3}
+                    style={{
+                      wordBreak: 'break-word',
+                      whiteSpace: 'normal',
+                      lineHeight: 1.5,
+                    }}
+                    mt="xs"
+                    dangerouslySetInnerHTML={{ __html: item.deskripsi }}
+                  />
                   <Group justify="apart" mt="md" gap="xs">
-                    <Text size="xs" c="dimmed">
+                    <Text
+                      fz={{ base: 'xs', md: 'xs' }}
+                      c="dimmed"
+                      lh={1.4}
+                      style={{ fontSize: '0.75rem', lineHeight: '1.125rem' }}
+                    >
                       {new Date(item.createdAt).toLocaleDateString('id-ID', {
                         day: 'numeric',
                         month: 'short',
diff --git a/src/app/darmasaba/(pages)/desa/berita/[kategori]/[id]/page.tsx b/src/app/darmasaba/(pages)/desa/berita/[kategori]/[id]/page.tsx
index efcbd850..3da5058a 100644
--- a/src/app/darmasaba/(pages)/desa/berita/[kategori]/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/berita/[kategori]/[id]/page.tsx
@@ -3,18 +3,16 @@
 import stateDashboardBerita from '@/app/admin/(dashboard)/_state/desa/berita';
 import NewsReader from '@/app/darmasaba/_com/NewsReader';
 import colors from '@/con/colors';
-import { Box, Center, Container, Group, Image, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Center, Container, Group, Image, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { useParams } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
-
-
 function Page() {
   const params = useParams<{ id: string }>();
   const id = Array.isArray(params.id) ? params.id[0] : params.id;
-  const state = useProxy(stateDashboardBerita.berita)
-  const [loading, setLoading] = useState(true)
+  const state = useProxy(stateDashboardBerita.berita);
+  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
     const loadData = async () => {
@@ -27,9 +25,9 @@ function Page() {
       } finally {
         setLoading(false);
       }
-    }
-    loadData()
-  }, [id])
+    };
+    loadData();
+  }, [id]);
 
   if (loading) {
     return (
@@ -47,41 +45,49 @@ function Page() {
     );
   }
 
-
   return (
-    <Stack pos={"relative"} bg={colors.Bg} pb={"xl"} gap={"xs"} px={{ base: "md", md: 0 }}>
-      <Group px={{ base: "md", md: 100 }}>
+    <Stack pos="relative" bg={colors.Bg} pb="xl" gap="xs" px={{ base: 'md', md: 0 }}>
+      <Group px={{ base: 'md', md: 100 }}>
         <NewsReader />
       </Group>
-      <Container w={{ base: "100%", md: "50%" }} >
+      <Container w={{ base: '100%', md: '50%' }}>
         <Box pb={20}>
-          <Text id='news-title' ta={"center"} fz={"2.4rem"} c={colors["blue-button"]} fw={"bold"}>
-            {state.findUnique.data?.judul}
-          </Text>
-          <Text
-            ta={"center"}
-            fw={"bold"}
-            fz={"1.5rem"}
+          <Title
+            id="news-title"
+            order={1}
+            ta="center"
+            c={colors['blue-button']}
+            fw="bold"
+            lh={{ base: 1.2, md: 1.25 }}
+          >
+            {state.findUnique.data.judul}
+          </Title>
+          <Title
+            order={2}
+            ta="center"
+            fw="bold"
+            fz={{ base: 'md', md: 'lg' }}
+            lh={{ base: 1.3, md: 1.35 }}
           >
             Informasi dan Pelayanan Administrasi Digital
-          </Text>
+          </Title>
         </Box>
-        <Image src={state.findUnique.data?.image?.link || ''} alt='' w={"100%"} loading="lazy" />
+        <Image src={state.findUnique.data.image?.link || ''} alt="" w="100%" loading="lazy" />
       </Container>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={"xs"}>
+      <Box px={{ base: 'md', md: 100 }}>
+        <Stack gap="xs">
           <Text
-           id='news-content'
+            id="news-content"
             py={20}
-            fz={{ base: "sm", md: "lg" }}
-            lh={{ base: 1.6, md: 1.8 }} // ✅ line-height lebih rapat dan responsif
+            fz={{ base: 'sm', md: 'md' }}
+            lh={{ base: 1.6, md: 1.8 }}
             ta="justify"
             style={{
-              wordBreak: "break-word",
-              whiteSpace: "normal",
+              wordBreak: 'break-word',
+              whiteSpace: 'normal',
             }}
             dangerouslySetInnerHTML={{
-              __html: state.findUnique.data?.content || "",
+              __html: state.findUnique.data.content || '',
             }}
           />
         </Stack>
@@ -90,4 +96,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/berita/semua/page.tsx b/src/app/darmasaba/(pages)/desa/berita/semua/page.tsx
index f37d9a93..50425ff0 100644
--- a/src/app/darmasaba/(pages)/desa/berita/semua/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/berita/semua/page.tsx
@@ -16,35 +16,30 @@ function Semua() {
   const searchParams = useSearchParams();
   const router = useTransitionRouter();
 
-  // Ambil parameter langsung dari URL
   const search = searchParams.get('search') || '';
   const page = parseInt(searchParams.get('page') || '1');
 
-  // Gunakan proxy untuk state global
   const state = useProxy(stateDashboardBerita.berita);
   const featured = useProxy(stateDashboardBerita.berita.findFirst);
   const loadingGrid = state.findMany.loading;
   const loadingFeatured = featured.loading;
 
-  // Load berita utama sekali saja
   useEffect(() => {
     if (!featured.data && !loadingFeatured) {
       stateDashboardBerita.berita.findFirst.load();
     }
   }, [featured.data, loadingFeatured]);
 
-  // Load berita terbaru tiap page / search berubah
   useEffect(() => {
     const limit = 3;
     state.findMany.load(page, limit, search);
   }, [page, search]);
 
-  // Handler pagination → langsung update URL
   const handlePageChange = (newPage: number) => {
     const url = new URLSearchParams(searchParams.toString());
     if (search) url.set('search', search);
     if (newPage > 1) url.set('page', newPage.toString());
-    else url.delete('page'); // biar page=1 ga muncul di URL
+    else url.delete('page');
 
     router.replace(`?${url.toString()}`);
   };
@@ -61,7 +56,7 @@ function Semua() {
           <Center><Skeleton h={400} /></Center>
         ) : featuredData ? (
           <Box mb={50}>
-            <Text fz="h2" fw={700} mb="md">Berita Utama</Text>
+            <Title order={2} mb="md">Berita Utama</Title>
             <Paper shadow="md" radius="md" withBorder>
               <Grid gutter={0}>
                 <GridCol span={{ base: 12, md: 6 }}>
@@ -81,13 +76,24 @@ function Semua() {
                       <Badge color="blue" variant="light" mb="md">
                         {featuredData.kategoriBerita?.name || 'Berita'}
                       </Badge>
-                      <Title order={2} mb="md">{featuredData.judul}</Title>
-                      <Text c="dimmed" lineClamp={3} mb="md" dangerouslySetInnerHTML={{ __html: featuredData.deskripsi }} />
+                      <Title order={3} mb="md">{featuredData.judul}</Title>
+                      <Text
+                        c="dimmed"
+                        lineClamp={3}
+                        mb="md"
+                        dangerouslySetInnerHTML={{ __html: featuredData.deskripsi }}
+                        fz={{ base: 'sm', md: 'md' }}
+                        lh={{ base: 1.5, md: 1.6 }}
+                      />
                     </div>
                     <Group justify="apart" mt="auto">
                       <Group gap="xs">
                         <IconCalendar size={18} />
-                        <Text size="sm">
+                        <Text
+                          c="dimmed"
+                          fz={{ base: 'xs', md: 'sm' }}
+                          lh={{ base: 1.4, md: 1.5 }}
+                        >
                           {new Date(featuredData.createdAt).toLocaleDateString('id-ID', {
                             day: 'numeric',
                             month: 'long',
@@ -124,7 +130,9 @@ function Semua() {
               ))}
             </SimpleGrid>
           ) : paginatedNews.length === 0 ? (
-            <Text c="dimmed" ta="center">Tidak ada berita ditemukan.</Text>
+            <Text c="dimmed" ta="center" fz={{ base: 'sm', md: 'md' }} lh={{ base: 1.5, md: 1.6 }}>
+              Tidak ada berita ditemukan.
+            </Text>
           ) : (
             <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl" verticalSpacing="xl">
               {paginatedNews.map((item) => (
@@ -143,11 +151,24 @@ function Semua() {
                     {item.kategoriBerita?.name || 'Berita'}
                   </Badge>
 
-                  <Text fw={600} size="lg" mt="sm" lineClamp={2}>{item.judul}</Text>
-                  <Text size="sm" c="dimmed" lineClamp={3} mt="xs" dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                  <Title order={4} mt="sm" lineClamp={2}>
+                    {item.judul}
+                  </Title>
+                  <Text
+                    c="dimmed"
+                    lineClamp={3}
+                    mt="xs"
+                    dangerouslySetInnerHTML={{ __html: item.deskripsi }}
+                    fz={{ base: 'xs', md: 'sm' }}
+                    lh={{ base: 1.5, md: 1.6 }}
+                  />
 
                   <Flex align="center" justify="apart" mt="md" gap="xs">
-                    <Text size="xs" c="dimmed">
+                    <Text
+                      c="dimmed"
+                      fz={{ base: 'xs', md: 'xs' }}
+                      lh={{ base: 1.4, md: 1.4 }}
+                    >
                       {new Date(item.createdAt).toLocaleDateString('id-ID', {
                         day: 'numeric',
                         month: 'short',
@@ -187,4 +208,4 @@ function Semua() {
   );
 }
 
-export default Semua;
+export default Semua;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/galery/foto/Content.tsx b/src/app/darmasaba/(pages)/desa/galery/foto/Content.tsx
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/app/darmasaba/(pages)/desa/galery/foto/page.tsx b/src/app/darmasaba/(pages)/desa/galery/foto/page.tsx
index 322e92c9..b84540e3 100644
--- a/src/app/darmasaba/(pages)/desa/galery/foto/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/galery/foto/page.tsx
@@ -17,17 +17,11 @@ import {
 } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconPhoto } from '@tabler/icons-react';
-import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
 // Komponen kartu foto
 function FotoCard({ item }: { item: any }) {
-  const router = useRouter();
-
-  const handleClick = () => {
-    router.push(`/darmasaba/galeri/foto/${item.id}`);
-  };
 
   return (
     <Grid.Col span={{ base: 12, xs: 6, md: 4 }}>
@@ -35,19 +29,19 @@ function FotoCard({ item }: { item: any }) {
         shadow="sm"
         radius="md"
         p={0}
-        onClick={handleClick}
-        style={{ cursor: 'pointer', transition: 'transform 0.2s' }}
+        style={{ transition: 'transform 0.2s' }}
         onMouseEnter={(e) => (e.currentTarget.style.transform = 'scale(1.02)')}
         onMouseLeave={(e) => (e.currentTarget.style.transform = 'scale(1)')}
+        
       >
         {item.imageGalleryFoto?.link ? (
           <Box
             pos="relative"
             style={{
-              paddingBottom: '100%', // ✅ Ubah ke 1:1 (square) — atau sesuaikan
+              paddingBottom: '100%',
               overflow: 'hidden',
               borderRadius: '4px 4px 0 0',
-              backgroundColor: '#f9f9f9', // ✅ background netral
+              backgroundColor: '#f9f9f9',
             }}
           >
             <Image
@@ -61,8 +55,8 @@ function FotoCard({ item }: { item: any }) {
                 left: 0,
                 width: '100%',
                 height: '100%',
-                objectFit: 'contain', // ✅ Tampilkan utuh, jangan crop
-                objectPosition: 'center', // rata tengah
+                objectFit: 'contain',
+                objectPosition: 'center',
               }}
               loading="lazy"
             />
@@ -74,13 +68,23 @@ function FotoCard({ item }: { item: any }) {
         )}
 
         <Stack p="md" gap={4}>
-          <Text fw={600} lineClamp={1}>
+          <Text fw={600} lineClamp={1} fz={{ base: 'sm', md: 'md' }} lh={{ base: '1.4', md: '1.5' }}>
             {item.name || 'Tanpa Judul'}
           </Text>
           {item.deskripsi && (
-            <Text fz="sm" c="dimmed" lineClamp={2} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+            <Text
+              fz={{ base: 'xs', md: 'sm' }}
+              c="dimmed"
+              lineClamp={2}
+              dangerouslySetInnerHTML={{ __html: item.deskripsi }}
+              lh={{ base: '1.4', md: '1.5' }}
+            />
           )}
-          <Text fz="xs" c="dimmed">
+          <Text
+            fz={{ base: 11, md: 'xs' }}
+            c="dimmed"
+            lh={{ base: '1.3', md: '1.4' }}
+          >
             {new Date(item.createdAt).toLocaleDateString('id-ID', {
               day: 'numeric',
               month: 'short',
@@ -99,7 +103,7 @@ export default function GaleriFotoUser() {
   return (
     <Box py="xl" px={{ base: 'md', md: 'lg' }}>
       {/* Header */}
-      <Title order={2} c={colors['blue-button']} mb="lg">
+      <Title order={2} c={colors['blue-button']} mb="lg" ta="center">
         Galeri Foto Desa Darmasaba
       </Title>
 
@@ -115,7 +119,7 @@ function FotoList({ search }: { search: string }) {
   const { data, page, totalPages, loading, load } = FotoState.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search); // ✅ 9 item per halaman
+    load(page, 3, search);
   }, [page, search]);
 
   if (loading) {
@@ -135,7 +139,9 @@ function FotoList({ search }: { search: string }) {
       <Center py="xl">
         <Stack align="center" c="dimmed">
           <IconPhoto size={48} />
-          <Text>Tidak ada foto ditemukan</Text>
+          <Text fz={{ base: 'sm', md: 'md' }} lh={{ base: '1.4', md: '1.5' }}>
+            Tidak ada foto ditemukan
+          </Text>
         </Stack>
       </Center>
     );
@@ -150,19 +156,18 @@ function FotoList({ search }: { search: string }) {
       </Grid>
 
       {/* Pagination */}
-      
-        <Center>
-          <Pagination
-            value={page}
-            onChange={(newPage) => {
-              load(newPage, 3, search);
-              window.scrollTo({ top: 0, behavior: 'smooth' });
-            }}
-            total={totalPages}
-            color="blue"
-            radius="md"
-          />
-        </Center>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 3, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          color="blue"
+          radius="md"
+        />
+      </Center>
     </Stack>
   );
 }
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/galery/video/Content.tsx b/src/app/darmasaba/(pages)/desa/galery/video/Content.tsx
index 2e4599e9..ed4b0667 100644
--- a/src/app/darmasaba/(pages)/desa/galery/video/Content.tsx
+++ b/src/app/darmasaba/(pages)/desa/galery/video/Content.tsx
@@ -11,7 +11,8 @@ import {
   Paper,
   SimpleGrid,
   Stack,
-  Text
+  Text,
+  Title
 } from '@mantine/core';
 import { useTransitionRouter } from 'next-view-transitions';
 import { useCallback, useEffect } from 'react';
@@ -19,15 +20,13 @@ import { useSnapshot } from 'valtio';
 
 export default function VideoContent() {
   const videoState = useSnapshot(stateGallery.video);
-  const router = useTransitionRouter()
+  const router = useTransitionRouter();
   const { data, page, totalPages, loading } = videoState.findMany;
 
-  // Handle search and pagination changes
   const loadData = useCallback((pageNum: number, searchTerm: string) => {
     stateGallery.video.findMany.load(pageNum, 3, searchTerm.trim());
   }, []);
 
-  // Initial load and URL change handler
   useEffect(() => {
     const handleRouteChange = () => {
       const urlParams = new URLSearchParams(window.location.search);
@@ -57,13 +56,14 @@ export default function VideoContent() {
     loadData(newPage, search);
   };
 
-
   const dataVideo = data || [];
 
   if (loading && !data) {
     return (
       <Box py={10}>
-        <Text>Memuat Video...</Text>
+        <Text fz={{ base: 'sm', md: 'md' }} c="dimmed" ta="center">
+          Memuat Video...
+        </Text>
       </Box>
     );
   }
@@ -78,55 +78,71 @@ export default function VideoContent() {
               p="md"
               radius={26}
               bg={colors['white-trans-1']}
-              w={{ base: '100%', md: '100%' }}
+              w="100%"
             >
-              <Box>
-                <Center>
-                  <Box
-                    component="iframe"
-                    src={convertToEmbedUrl(v.linkVideo)}
-                    width="100%"
-                    height={300}
-                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-                    allowFullScreen
-                    style={{ borderRadius: 8 }}
-                  />
-                </Center>
-              </Box>
-              <Box>
-                <Stack gap="sm" py={10}>
-                  <Text fz="sm" c="dimmed">
-                    {new Date(v.createdAt).toLocaleDateString('id-ID', {
-                      day: 'numeric',
-                      month: 'long',
-                      year: 'numeric',
-                    })}
-                  </Text>
-                  <Text fw="bold" fz="sm" lineClamp={1}>
-                    {v.name}
-                  </Text>
-                  <Text
-                    ta="justify"
-                    fz="sm"
-                    dangerouslySetInnerHTML={{ __html: v.deskripsi }}
-                    style={{ wordBreak: "break-word", whiteSpace: "normal" }}
-                    lineClamp={3}
-                    truncate="end"
-                  />
-                  <Group justify={"right"}>
-                    <Button
+              <Center>
+                <Box
+                  component="iframe"
+                  src={convertToEmbedUrl(v.linkVideo)}
+                  width="100%"
+                  height={300}
+                  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                  allowFullScreen
+                  style={{ borderRadius: 8 }}
+                />
+              </Center>
+
+              <Stack gap="sm" py={10}>
+                {/* Tanggal: Caption */}
+                <Text
+                  fz={{ base: 12, md: 14 }}
+                  c="dimmed"
+                  ta="left"
+                >
+                  {new Date(v.createdAt).toLocaleDateString('id-ID', {
+                    day: 'numeric',
+                    month: 'long',
+                    year: 'numeric',
+                  })}
+                </Text>
+
+                {/* Judul Video: Subsection (H3) */}
+                <Title
+                  order={3}
+                  c="dark"
+                  ta="left"
+                  lh={1.3}
+                  style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}
+                >
+                  {v.name}
+                </Title>
+
+                {/* Deskripsi: Body kecil */}
+                <Text
+                  ta="justify"
+                  fz={{ base: 13, md: 14 }}
+                  c="dimmed"
+                  style={{ wordBreak: 'break-word' }}
+                  lineClamp={3}
+                >
+                  <span dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
+                </Text>
+
+                <Group justify="right">
+                  <Button
                     onClick={() => router.push(`/darmasaba/desa/galery/video/${v.id}`)}
                     bg={colors['blue-button']}
+                    fz={{ base: 'sm', md: 'md' }}
                   >
                     Detail
                   </Button>
-                  </Group>
-                </Stack>
-              </Box>
+                </Group>
+              </Stack>
             </Paper>
           </Box>
         ))}
       </SimpleGrid>
+
       <Center>
         <Pagination
           value={page}
@@ -140,7 +156,6 @@ export default function VideoContent() {
   );
 }
 
-// ✅ Fix: convert YouTube URL ke embed
 function convertToEmbedUrl(youtubeUrl: string): string {
   try {
     const url = new URL(youtubeUrl);
@@ -151,4 +166,4 @@ function convertToEmbedUrl(youtubeUrl: string): string {
     console.error('Error converting YouTube URL to embed:', err);
     return youtubeUrl;
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/galery/video/[id]/page.tsx b/src/app/darmasaba/(pages)/desa/galery/video/[id]/page.tsx
index 7000b863..2e65b465 100644
--- a/src/app/darmasaba/(pages)/desa/galery/video/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/galery/video/[id]/page.tsx
@@ -12,16 +12,17 @@ import {
   Stack,
   Text,
   ThemeIcon,
+  Title,
 } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack, IconInfoCircle, IconVideo } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
-import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery'; // pastikan state bisa dipakai di publik
+import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
 import BackButton from '../../../layanan/_com/BackButto';
 
-// Fungsi helper: aman dan tanpa spasi
+
 function convertToEmbedUrl(youtubeUrl: string): string {
   try {
     const url = new URL(youtubeUrl);
@@ -72,7 +73,9 @@ export default function DetailVideoUser() {
           color="red"
           radius="md"
         >
-          Video yang Anda cari tidak tersedia.
+          <Text fz={{ base: 'sm', md: 'md' }} c="red.9">
+            Video yang Anda cari tidak tersedia.
+          </Text>
         </Alert>
         <Button
           leftSection={<IconArrowBack size={16} />}
@@ -91,20 +94,20 @@ export default function DetailVideoUser() {
   return (
     <Box py="xl" px={{ base: 'md', md: 100 }}>
       {/* Tombol Kembali */}
-      <Box >
+      <Box>
         <BackButton />
       </Box>
 
-      {/* Header */}
-      <Text
+      {/* Header - Dijadikan Title */}
+      <Title
+        order={1}
         ta="center"
-        fz={{ base: 'xl', md: '2xl' }}
-        fw={700}
         c={colors['blue-button']}
         mb="lg"
+        lh={{ base: 1.2, md: 1.25 }}
       >
         {data.name || 'Video Galeri Desa'}
-      </Text>
+      </Title>
 
       {/* Konten Utama */}
       <Card
@@ -118,7 +121,7 @@ export default function DetailVideoUser() {
           {embedUrl ? (
             <Box
               pos="relative"
-              style={{ paddingBottom: '56.25%', height: 0, overflow: 'hidden' }} // 16:9 aspect ratio
+              style={{ paddingBottom: '56.25%', height: 0, overflow: 'hidden' }}
             >
               <iframe
                 src={embedUrl}
@@ -144,7 +147,9 @@ export default function DetailVideoUser() {
               title="Gagal memuat video"
               radius="md"
             >
-              Mohon maaf, video tidak dapat diputar.
+              <Text fz={{ base: 'xs', md: 'sm' }} c="orange.9">
+                Mohon maaf, video tidak dapat diputar.
+              </Text>
             </Alert>
           ) : (
             <Alert
@@ -153,7 +158,9 @@ export default function DetailVideoUser() {
               title="Tidak ada video"
               radius="md"
             >
-              Konten video belum tersedia.
+              <Text fz={{ base: 'xs', md: 'sm' }} c="dimmed">
+                Konten video belum tersedia.
+              </Text>
             </Alert>
           )}
 
@@ -163,7 +170,11 @@ export default function DetailVideoUser() {
               <ThemeIcon variant="light" size="sm" radius="xl">
                 <IconInfoCircle size={14} />
               </ThemeIcon>
-              <Text fz="sm" c="dimmed">
+              <Text
+                fz={{ base: 'xs', md: 'sm' }}
+                c="dimmed"
+                lh={{ base: 1.4, md: 1.5 }}
+              >
                 Diunggah pada{' '}
                 {new Date(data.createdAt).toLocaleDateString('id-ID', {
                   weekday: 'long',
@@ -179,8 +190,9 @@ export default function DetailVideoUser() {
           {data.deskripsi && (
             <Paper p="md" bg="gray.0" radius="md">
               <Text
-                fz="md"
+                fz={{ base: 'sm', md: 'md' }}
                 c="dark"
+                ta={"justify"}
                 dangerouslySetInnerHTML={{ __html: data.deskripsi }}
                 style={{
                   wordBreak: 'break-word',
diff --git a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPendudukNonPermanent.tsx b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPendudukNonPermanent.tsx
index c35a976b..1a49feab 100644
--- a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPendudukNonPermanent.tsx
+++ b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPendudukNonPermanent.tsx
@@ -3,7 +3,7 @@
 
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
 import colors from '@/con/colors';
-import { ActionIcon, Box, Divider, Flex, Group, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
+import { ActionIcon, Box, Divider, Flex, Group, Skeleton, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { IconBrandFacebook, IconBrandInstagram, IconBrandTwitter, IconBrandWhatsapp } from '@tabler/icons-react';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -39,30 +39,38 @@ function PelayananPendudukNonPermanent() {
       ) : (
         <Stack gap="xl">
           <Box>
-            <Text fz={{ base: "xl", md: "2xl" }} fw={700} lh={1.3} c="dark">
+            <Title
+              order={1}
+              fz={{ base: 'lg', md: 'xl' }}
+              fw={700}
+              lh={{ base: 1.3, md: 1.3 }}
+              c="dark"
+            >
               {data?.name || "Judul belum tersedia"}
-            </Text>
+            </Title>
           </Box>
 
           <Box>
             {data?.deskripsi ? (
               <Text
-                fz={{ base: "sm", md: "md" }}
-                lh={1.7}
+                fz={{ base: 'sm', md: 'md' }}
+                lh={{ base: 1.6, md: 1.7 }}
                 ta="justify"
-                c="dimmed"
+                c="black"
                 dangerouslySetInnerHTML={{ __html: data?.deskripsi }}
-                style={{wordBreak: "break-word", whiteSpace: "normal"}}
+                style={{ wordBreak: "break-word", whiteSpace: "normal" }}
               />
             ) : (
-              <Text fz="sm" c="gray">Deskripsi belum tersedia.</Text>
+              <Text fz="xs" c="gray">
+                Deskripsi belum tersedia.
+              </Text>
             )}
           </Box>
 
           <Divider color={colors["blue-button"]} size="sm" />
 
           <Flex justify="space-between" align="center" wrap="wrap" gap="md">
-            <Text fz={{ base: "xs", md: "sm" }} c="dimmed">
+            <Text fz={{ base: 'xs', md: 'sm' }} lh={{ base: 1.4, md: 1.5 }} c="black">
               25 Mei 2021 • Darmasaba
             </Text>
             <Group gap="md">
@@ -96,4 +104,4 @@ function PelayananPendudukNonPermanent() {
   );
 }
 
-export default PelayananPendudukNonPermanent;
+export default PelayananPendudukNonPermanent;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPerizinanBerusaha.tsx b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPerizinanBerusaha.tsx
index 08f63752..14079e6f 100644
--- a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPerizinanBerusaha.tsx
+++ b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPerizinanBerusaha.tsx
@@ -47,7 +47,7 @@ function PelayananPerizinanBerusaha() {
     return (
       <Center mih={300}>
         <Stack align="center" gap="sm">
-          <Text fz="lg" fw={500} c="dimmed">
+          <Text fz={{ base: 'md', md: 'lg' }} fw={500} c="dimmed" lh="sm">
             Belum ada informasi layanan yang tersedia
           </Text>
           <Button component="a" href="https://oss.go.id" target="_blank" radius="xl">
@@ -67,10 +67,10 @@ function PelayananPerizinanBerusaha() {
       ) : (
         <Stack gap="lg">
           <Box>
-            <Title order={2} fw={700} fz={{ base: 22, md: 32 }} mb="sm">
+            <Title order={2} fw={700} mb="sm">
               Perizinan Berusaha Berbasis Risiko melalui OSS
             </Title>
-            <Text fz={{ base: 'sm', md: 'md' }} c="dimmed">
+            <Text fz={{ base: 'sm', md: 'md' }} c="black" lh="sm">
               Sistem Online Single Submission (OSS) untuk pendaftaran NIB
             </Text>
           </Box>
@@ -83,13 +83,13 @@ function PelayananPerizinanBerusaha() {
           />
 
           <Box>
-            <Text fw={600} mb="sm" fz={{ base: 'sm', md: 'lg' }}>
+            <Title order={3} fw={600} mb="sm">
               Alur pendaftaran NIB:
-            </Text>
+            </Title>
             <Stepper
               active={active}
               onStepClick={(step) => {
-                if (step <= active) { // Only allow clicking on previous or current steps
+                if (step <= active) {
                   setActive(step);
                 }
               }}
@@ -102,28 +102,42 @@ function PelayananPerizinanBerusaha() {
               }}
             >
               <StepperStep label="Langkah 1" description="Daftar Akun">
-                <Text fz="sm">Membuat akun di portal OSS</Text>
+                <Text fz={{ base: 'xs', md: 'sm' }} lh="sm">
+                  Membuat akun di portal OSS
+                </Text>
               </StepperStep>
               <StepperStep label="Langkah 2" description="Isi Data Perusahaan">
-                <Text fz="sm">Lengkapi informasi perusahaan, data pemegang saham, dan alamat</Text>
+                <Text fz={{ base: 'xs', md: 'sm' }} lh="sm">
+                  Lengkapi informasi perusahaan, data pemegang saham, dan alamat
+                </Text>
               </StepperStep>
               <StepperStep label="Langkah 3" description="Pilih KBLI">
-                <Text fz="sm">Menentukan kode KBLI sesuai jenis usaha</Text>
+                <Text fz={{ base: 'xs', md: 'sm' }} lh="sm">
+                  Menentukan kode KBLI sesuai jenis usaha
+                </Text>
               </StepperStep>
               <StepperStep label="Langkah 4" description="Unggah Dokumen">
-                <Text fz="sm">Unggah akta pendirian, surat izin, dan dokumen wajib lainnya</Text>
+                <Text fz={{ base: 'xs', md: 'sm' }} lh="sm">
+                  Unggah akta pendirian, surat izin, dan dokumen wajib lainnya
+                </Text>
               </StepperStep>
               <StepperStep label="Langkah 5" description="Verifikasi Instansi">
-                <Text fz="sm">Menunggu verifikasi dan persetujuan dari pihak berwenang</Text>
+                <Text fz={{ base: 'xs', md: 'sm' }} lh="sm">
+                  Menunggu verifikasi dan persetujuan dari pihak berwenang
+                </Text>
               </StepperStep>
               <StepperStep label="Langkah 6" description="Terbit NIB">
-                <Text fz="sm">Menerima NIB sebagai identitas resmi usaha</Text>
+                <Text fz={{ base: 'xs', md: 'sm' }} lh="sm">
+                  Menerima NIB sebagai identitas resmi usaha
+                </Text>
               </StepperStep>
               <StepperCompleted>
                 <Center>
                   <Stack align="center" gap="xs">
                     <IconCheck size={40} color="green" />
-                    <Text fz="sm" fw={500}>Proses pendaftaran selesai</Text>
+                    <Text fz={{ base: 'xs', md: 'sm' }} fw={500} lh="sm">
+                      Proses pendaftaran selesai
+                    </Text>
                   </Stack>
                 </Center>
               </StepperCompleted>
@@ -159,7 +173,7 @@ function PelayananPerizinanBerusaha() {
             )}
           </Box>
 
-          <Text fz="sm" ta="justify" c="dimmed" mt="md">
+          <Text fz={{ base: 'xs', md: 'sm' }} ta="justify" c="black" lh="sm" mt="md">
             Catatan: Persyaratan dan prosedur dapat berubah sewaktu-waktu. Untuk informasi resmi terbaru, silakan kunjungi situs{' '}
             <a href="https://oss.go.id/" target="_blank" rel="noopener noreferrer">
               oss.go.id
diff --git a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananSuratKeterangan.tsx b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananSuratKeterangan.tsx
index e079820c..236bb9de 100644
--- a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananSuratKeterangan.tsx
+++ b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananSuratKeterangan.tsx
@@ -2,7 +2,7 @@
 
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
 import colors from '@/con/colors';
-import { BackgroundImage, Box, Button, Center, Group, Pagination, SimpleGrid, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
+import { BackgroundImage, Box, Button, Center, Group, Pagination, SimpleGrid, Skeleton, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconFileDescription, IconInfoCircle } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -35,7 +35,7 @@ function PelayananSuratKeterangan({ search }: { search: string }) {
       <Center py="xl">
         <Stack align="center" gap="xs">
           <IconFileDescription size={40} stroke={1.5} color={colors["blue-button"]} />
-          <Text c="dimmed" ta="center">
+          <Text c="dimmed" ta="center" fz={{ base: 'sm', md: 'md' }} lh="sm">
             Tidak ada layanan surat keterangan yang ditemukan
           </Text>
         </Stack>
@@ -48,9 +48,9 @@ function PelayananSuratKeterangan({ search }: { search: string }) {
       <Group justify="space-between" align="center" mb="md">
         <Group gap="xs">
           <IconFileDescription size={28} stroke={1.8} />
-          <Text fz={{ base: "h4", md: "h2" }} fw={700}>
+          <Title order={2} c="black">
             Layanan Surat Keterangan
-          </Text>
+          </Title>
         </Group>
         <Tooltip label="Pilih layanan surat keterangan sesuai kebutuhan Anda" withArrow>
           <IconInfoCircle size={22} stroke={1.8} />
@@ -82,15 +82,15 @@ function PelayananSuratKeterangan({ search }: { search: string }) {
               style={{ borderRadius: 16 }}
             />
             <Stack justify="space-between" h="100%" gap="md" p="lg" pos="relative">
-              <Text
+              <Title
+                order={3}
                 c="white"
-                fw={600}
-                fz="lg"
                 ta="center"
                 lineClamp={2}
+                lh="sm"
               >
                 {v.name}
-              </Text>
+              </Title>
               <Group justify="center">
                 <Button
                   size="md"
@@ -128,4 +128,4 @@ function PelayananSuratKeterangan({ search }: { search: string }) {
   );
 }
 
-export default PelayananSuratKeterangan;
+export default PelayananSuratKeterangan;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananTelunjukSaktiDesa.tsx b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananTelunjukSaktiDesa.tsx
index ec91c3f7..b8de2676 100644
--- a/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananTelunjukSaktiDesa.tsx
+++ b/src/app/darmasaba/(pages)/desa/layanan/_com/pelayananTelunjukSaktiDesa.tsx
@@ -42,9 +42,10 @@ function PelayananTelunjukSaktiDesa() {
 
   return (
     <Box>
-      <Title order={2} mb="lg" fz={{ base: 22, md: 28 }} fw={700} style={{ lineHeight: 1.4 }}>
-        Layanan Telunjuk Sakti Desa <br /> 
-        <Text span c="dimmed" fz="lg" fw={400}>
+      <Title order={2} mb="lg" fw={700} style={{ lineHeight: 1.3 }} ta="left">
+        Layanan Telunjuk Sakti Desa
+        <Text span c="black" fz={{ base: 'sm', md: 'md' }} fw={400} style={{ lineHeight: 1.5 }}>
+          {' '}
           Terwujudnya sistem administrasi kependudukan terintegrasi berbasis elektronik, cerdas, dan aman
         </Text>
       </Title>
@@ -53,7 +54,7 @@ function PelayananTelunjukSaktiDesa() {
         <Skeleton h={400} radius="lg" />
       ) : data.length === 0 ? (
         <Card shadow="sm" radius="lg" withBorder>
-          <Text c="dimmed" ta="center" py="xl">
+          <Text c="black" ta="center" py="xl" fz={{ base: 'sm', md: 'md' }} lh={1.5}>
             Belum ada layanan tersedia untuk saat ini
           </Text>
         </Card>
@@ -72,9 +73,9 @@ function PelayananTelunjukSaktiDesa() {
                 }}
               >
                 <Stack gap="sm">
-                  <Text fw={700} fz="lg" lh={1.4}>
+                  <Title order={3} fw={700} lh={1.3}>
                     {v.name}
-                  </Text>
+                  </Title>
                   <Flex gap="xs" align="center">
                     <IconExternalLink size={18} stroke={1.5} />
                     <Text
@@ -82,7 +83,7 @@ function PelayananTelunjukSaktiDesa() {
                       href={v.link}
                       target="_blank"
                       rel="noopener noreferrer"
-                      fz="sm"
+                      fz={{ base: 'xs', md: 'sm' }}
                       c="blue"
                       td="underline"
                       style={{ cursor: 'pointer' }}
@@ -100,4 +101,4 @@ function PelayananTelunjukSaktiDesa() {
   );
 }
 
-export default PelayananTelunjukSaktiDesa;
+export default PelayananTelunjukSaktiDesa;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/pengumuman/[name]/[id]/page.tsx b/src/app/darmasaba/(pages)/desa/pengumuman/[name]/[id]/page.tsx
index f103d6f8..45bb2e4c 100644
--- a/src/app/darmasaba/(pages)/desa/pengumuman/[name]/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/pengumuman/[name]/[id]/page.tsx
@@ -1,58 +1,94 @@
 'use client'
 import stateDesaPengumuman from '@/app/admin/(dashboard)/_state/desa/pengumuman';
 import colors from '@/con/colors';
-import { Box, Container, Group, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Container, Group, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { useParams } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
-import BackButton from '../../../layanan/_com/BackButto';
+
 import NewsReader from '@/app/darmasaba/_com/NewsReader';
+import BackButton from '../../../layanan/_com/BackButto';
 
 function Page() {
-  const detail = useProxy(stateDesaPengumuman.pengumuman.findUnique)
-
-  const params = useParams()
-
+  const detail = useProxy(stateDesaPengumuman.pengumuman.findUnique);
+  const params = useParams();
+  
   useShallowEffect(() => {
-    stateDesaPengumuman.pengumuman.findUnique.load(params?.id as string)
-  }, [])
-
+    stateDesaPengumuman.pengumuman.findUnique.load(params?.id as string);
+  }, []);
+  
   if (!detail.data) {
     return (
       <Box>
         <Skeleton h={400} />
       </Box>
-    )
+    );
   }
+  
   return (
     <Stack pos="relative" bg={colors.Bg} py="xl" gap="md">
       {/* Header */}
-      <Box px={{ base: "md", md: 100 }}>
+      <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
+      
       <Container size="lg" px="md">
         <Group>
           <NewsReader />
         </Group>
-        <Stack gap="xs" >
-            <Group justify={"space-between"} align={"center"}>
-              <Text fz={{ base: "2rem", md: "2rem" }} c={colors["blue-button"]} fw="bold" >
-                {detail.data?.judul}
+        
+        <Stack gap="xs">
+          <Group justify="space-between" align="flex-start" wrap="wrap">
+            <Title
+              order={1}
+              c={colors['blue-button']}
+              fz={{ base: 28, md: 36 }}
+              style={{ 
+                wordBreak: 'break-word',
+                flex: '1 1 auto',
+                minWidth: 0
+              }}
+            >
+              {detail.data?.judul}
+            </Title>
+            <Paper bg={colors['blue-button']} p={8} style={{ flexShrink: 0 }}>
+              <Text c={colors['white-1']} fz={{ base: 'xs', md: 'sm' }} lh={1.2}>
+                {detail.data?.CategoryPengumuman?.name}
               </Text>
-              <Group justify='end'>
-                <Paper bg={colors['blue-button']} p={5}>
-                  <Text  c={colors['white-1']}>{detail.data?.CategoryPengumuman?.name}</Text>
-                </Paper>
-              </Group>
-            </Group>
-          <Paper bg={colors["white-1"]} p="md">
-            <Text px="lg" id='news-content' fz={"md"} style={{wordBreak: "break-word", whiteSpace: "normal"}} dangerouslySetInnerHTML={{ __html: detail.data?.content }} />
-            <Text px="lg" fz={"md"} c={colors["blue-button"]} fw="bold" >
+            </Paper>
+          </Group>
+          
+          <Paper 
+            bg={colors['white-1']} 
+            p="md"
+            w="100%"
+            mih={{ base: 200, md: 300 }}
+          >
+            <Text
+              px="lg"
+              id="news-content"
+              fz={{ base: 14, md: 16 }}
+              lh={{ base: 1.6, md: 1.6 }}
+              style={{ 
+                wordBreak: 'break-word', 
+                whiteSpace: 'normal',
+                width: '100%'
+              }}
+              dangerouslySetInnerHTML={{ __html: detail.data?.content }}
+            />
+            <Text
+              px="lg"
+              fz={{ base: 12, md: 14 }}
+              c={colors['blue-button']}
+              fw="bold"
+              lh={{ base: 1.4, md: 1.4 }}
+              mt="md"
+            >
               {new Date(detail.data?.createdAt).toLocaleDateString('id-ID', {
                 weekday: 'long',
                 day: 'numeric',
                 month: 'long',
-                year: 'numeric'
+                year: 'numeric',
               })}
             </Text>
           </Paper>
@@ -62,4 +98,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/pengumuman/[name]/page.tsx b/src/app/darmasaba/(pages)/desa/pengumuman/[name]/page.tsx
index 6bdd20a1..5fc2f723 100644
--- a/src/app/darmasaba/(pages)/desa/pengumuman/[name]/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/pengumuman/[name]/page.tsx
@@ -2,14 +2,13 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import stateDesaPengumuman from '@/app/admin/(dashboard)/_state/desa/pengumuman';
 import colors from '@/con/colors';
-import { Box, Container, Group, Paper, Stack, Text } from '@mantine/core';
+import { Box, Container, Group, Paper, Stack, Text, Title } from '@mantine/core';
 import { IconCalendar } from '@tabler/icons-react';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../../layanan/_com/BackButto';
 import { useEffect } from 'react';
 import { useParams } from 'next/navigation';
 
-
 function Page() {
   const unwrappedParams = useParams();
   const kategoriState = useProxy(stateDesaPengumuman);
@@ -26,48 +25,85 @@ function Page() {
       <Box px={{ base: "md", md: 100 }}>
         <BackButton />
       </Box>
-      <Container size="lg" px="md" >
-        <Stack align="center" gap="0" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            {categoryName.split('-').map(word => 
+
+      <Container size="lg" px="md">
+        <Stack align="center" gap="xs">
+          <Title
+            order={1}
+            c={colors["blue-button"]}
+            ta="center"
+            style={{ fontWeight: 'bold' }}
+          >
+            {categoryName.split('-').map(word =>
               word.charAt(0).toUpperCase() + word.slice(1)
             ).join(' ')}
-          </Text>
-          <Text ta="center" px="md" pb={10}>
+          </Title>
+          <Text
+            ta="center"
+            px="md"
+            pb="sm"
+            fz={{ base: 'sm', md: 'md' }}
+            lh={{ base: 1.5, md: 1.6 }}
+            c="dimmed"
+          >
             Informasi dan pengumuman resmi terkait {categoryName.split('-').join(' ')}
           </Text>
         </Stack>
       </Container>
+
       <Box px={{ base: 'md', md: 100 }}>
         {!kategoriState.pengumuman.findMany.data?.length ? (
           <Paper p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-            Tidak ada pengumuman yang ditemukan
+            <Text
+              fz={{ base: 'sm', md: 'md' }}
+              ta="center"
+              c="dimmed"
+            >
+              Tidak ada pengumuman yang ditemukan
+            </Text>
           </Paper>
-        ) : kategoriState.pengumuman.findMany.data?.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
+        ) : (
+          kategoriState.pengumuman.findMany.data?.map((v, k) => (
+            <Paper
+              mb="md"
+              key={k}
+              withBorder
+              p="lg"
+              radius="md"
+              shadow="md"
+              bg={colors["white-1"]}
+            >
+              <Title order={3}>{v.judul}</Title>
+              <Group style={{ color: 'black' }} pb="sm">
                 <Group gap="xs">
                   <IconCalendar size={18} />
-                  <Text size="sm">
-                    {v.createdAt ? new Date(v.createdAt).toLocaleDateString('id-ID', {
-                      day: 'numeric',
-                      month: 'long',
-                      year: 'numeric',
-                    }) : 'No date available'}
+                  <Text
+                    fz={{ base: 'xs', md: 'sm' }}
+                    lh={{ base: 1.4, md: 1.5 }}
+                  >
+                    {v.createdAt
+                      ? new Date(v.createdAt).toLocaleDateString('id-ID', {
+                          day: 'numeric',
+                          month: 'long',
+                          year: 'numeric',
+                        })
+                      : 'No date available'}
                   </Text>
                 </Group>
               </Group>
-              <Text ta={'justify'}>
+              <Text
+                ta="justify"
+                fz={{ base: 'sm', md: 'md' }}
+                lh={{ base: 1.6, md: 1.7 }}
+              >
                 {v.deskripsi}
               </Text>
             </Paper>
-          )
-        })}
+          ))
+        )}
       </Box>
     </Stack>
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/pengumuman/page.tsx b/src/app/darmasaba/(pages)/desa/pengumuman/page.tsx
index f964f519..b02ae29d 100644
--- a/src/app/darmasaba/(pages)/desa/pengumuman/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/pengumuman/page.tsx
@@ -9,7 +9,6 @@ import {
   Center,
   Container,
   Divider,
-  Flex,
   Grid,
   GridCol,
   Group,
@@ -22,7 +21,7 @@ import {
   Text,
   TextInput,
   Title,
-  UnstyledButton,
+  UnstyledButton
 } from '@mantine/core';
 import { IconCalendar, IconClock, IconSearch } from '@tabler/icons-react';
 import { useTransitionRouter } from 'next-view-transitions';
@@ -98,10 +97,14 @@ function Page() {
 
       <Container size="lg" px="md">
         <Stack align="center" gap="0">
-          <Text fz={{ base: '2rem', md: '3.4rem' }} c={colors['blue-button']} fw="bold" ta="center">
+          <Title
+            order={1}
+            c={colors['blue-button']}
+            ta="center"
+          >
             Pengumuman Desa Darmasaba
-          </Text>
-          <Text ta="center" px="md" pb={10}>
+          </Title>
+          <Text ta="center" px="md" pb={10} fz={{ base: 'sm', md: 'md' }} lh="sm">
             Informasi dan pengumuman resmi terkait kegiatan dan kebijakan Desa Darmasaba
           </Text>
         </Stack>
@@ -126,17 +129,17 @@ function Page() {
                     withCloseButton={false}
                     title={item.CategoryPengumuman?.name || 'Pengumuman'}
                   >
-                    <Stack gap={"xs"}>
-                      <Text fz="sm" fw="bold" c="black" style={{ textTransform: 'uppercase' }}>
+                    <Stack gap="xs">
+                      <Text fz={{ base: 'sm', md: 'sm' }} fw="bold" c="black" style={{ textTransform: 'uppercase' }}>
                         {item.judul}
                       </Text>
-                      <Text ta="justify" fz="sm" c="black" lineClamp={3} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                      <Text ta="justify" fz={{ base: 'xs', md: 'sm' }} c="black" lineClamp={3} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
                     </Stack>
-                    <Flex pt={20} gap="md" justify="space-between">
+                    <Group pt={20} gap="md" justify="space-between">
                       <Group style={{ color: 'black' }}>
                         <Group gap="xs">
                           <IconCalendar size={18} />
-                          <Text size="sm">
+                          <Text fz={{ base: 'xs', md: 'sm' }}>
                             {new Date(item.createdAt).toLocaleDateString('id-ID', {
                               weekday: 'long',
                               day: 'numeric',
@@ -147,7 +150,7 @@ function Page() {
                         </Group>
                         <Group gap="xs">
                           <IconClock size={18} />
-                          <Text size="sm">
+                          <Text fz={{ base: 'xs', md: 'sm' }}>
                             {new Date(item.createdAt).toLocaleTimeString('id-ID', {
                               hour: '2-digit',
                               minute: '2-digit',
@@ -157,11 +160,11 @@ function Page() {
                         </Group>
                       </Group>
                       <Anchor variant="transparent" href={`/darmasaba/desa/pengumuman/${item.CategoryPengumuman?.name}/${item.id}`}>
-                        <Text fs="unset" c={colors['blue-button']} fz="sm">
+                        <Text fs="unset" c={colors['blue-button']} fz={{ base: 'xs', md: 'sm' }}>
                           Baca Selengkapnya
                         </Text>
                       </Anchor>
-                    </Flex>
+                    </Group>
                   </Notification>
                 ))
             )}
@@ -169,19 +172,19 @@ function Page() {
 
           <Paper p="md">
             <Stack gap="xs">
-              <Text fw="bold" fz="lg" c={colors['blue-button']}>
+              <Title order={3} c={colors['blue-button']}>
                 Kategori
-              </Text>
+              </Title>
               {stateDesaPengumuman.category.findMany.data?.map((v: any, k) => {
                 const count = v._count?.pengumumans || 0;
                 return (
                   <UnstyledButton component={Link} href={`/darmasaba/desa/pengumuman/${v.name}`} key={k}>
                     <Paper bg={colors['BG-trans']} p={5}>
                       <Group px={3} justify="space-between">
-                        <Text fz="md" c="black">
+                        <Text fz={{ base: 'sm', md: 'md' }} c="black">
                           {v.name}
                         </Text>
-                        <Text fz="md" c="black">
+                        <Text fz={{ base: 'sm', md: 'md' }} c="black">
                           {count}
                         </Text>
                       </Group>
@@ -200,7 +203,7 @@ function Page() {
           <Divider mb={10} color={colors['blue-button']} />
           <Grid>
             <GridCol span={{ base: 12, md: 8 }}>
-              <Title order={3}>Daftar Pengumuman</Title>
+              <Title order={2}>Daftar Pengumuman</Title>
             </GridCol>
             <GridCol span={{ base: 12, md: 4 }}>
               <TextInput
@@ -210,6 +213,7 @@ function Page() {
                 w="100%"
                 value={searchInput}
                 onChange={(e) => setSearchInput(e.target.value)}
+                fz={{ base: 'sm', md: 'md' }}
               />
             </GridCol>
           </Grid>
@@ -223,7 +227,9 @@ function Page() {
             </SimpleGrid>
           ) : !state.findMany.data?.length ? (
             <Notification withCloseButton={false} h={100}>
-              Tidak ada pengumuman yang ditemukan
+              <Text fz={{ base: 'sm', md: 'md' }} ta="center">
+                Tidak ada pengumuman yang ditemukan
+              </Text>
             </Notification>
           ) : (
             <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg" verticalSpacing="lg">
@@ -231,26 +237,26 @@ function Page() {
                 <Paper key={item.id} p="md" withBorder radius="md" h="100%">
                   <Stack h="100%" justify="space-between">
                     <div>
-                      <Text fw={600} c={colors['blue-button']} mb={5}>
+                      <Text fw={600} c={colors['blue-button']} mb={5} fz={{ base: 'sm', md: 'md' }}>
                         {item.CategoryPengumuman?.name || 'Pengumuman'}
                       </Text>
-                      <Text fz="lg" fw={700} mb="sm" lineClamp={2} style={{ textTransform: 'uppercase' }}>
+                      <Text fw={700} mb="sm" lineClamp={2} style={{ textTransform: 'uppercase' }} fz={{ base: 'sm', md: 'lg' }}>
                         {item.judul}
                       </Text>
                       <Text
-                        fz="sm"
                         c="dimmed"
                         lineClamp={4}
                         dangerouslySetInnerHTML={{ __html: item.deskripsi }}
                         mb="md"
-                        style={{wordBreak: "break-word", whiteSpace: "normal"}}
+                        style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                        fz={{ base: 'xs', md: 'sm' }}
                       />
                     </div>
                     <div>
                       <Group mb="sm" c="dimmed">
                         <Group gap={5}>
                           <IconCalendar size={16} />
-                          <Text size="xs">
+                          <Text fz={{ base: 'xs', md: 'xs' }}>
                             {new Date(item.createdAt).toLocaleDateString('id-ID', {
                               day: 'numeric',
                               month: 'short',
@@ -260,19 +266,19 @@ function Page() {
                         </Group>
                         <Group gap={5}>
                           <IconClock size={16} />
-                          <Text size="xs">
+                          <Text fz={{ base: 'xs', md: 'xs' }}>
                             {new Date(item.createdAt).toLocaleTimeString('id-ID', {
                               hour: '2-digit',
                               minute: '2-digit',
                             })}
                           </Text>
                         </Group>
+                        <Anchor variant="transparent" href={`/darmasaba/desa/pengumuman/${item.CategoryPengumuman?.name}/${item.id}`}>
+                          <Text fw={600} c={colors['blue-button']} fz={{ base: 'sm', md: 'sm' }}>
+                            Baca Selengkapnya →
+                          </Text>
+                        </Anchor>
                       </Group>
-                      <Anchor variant="transparent" href={`/darmasaba/desa/pengumuman/${item.CategoryPengumuman?.name}/${item.id}`}>
-                        <Text fw={600} c={colors['blue-button']} size="sm">
-                          Baca Selengkapnya →
-                        </Text>
-                      </Anchor>
                     </div>
                   </Stack>
                 </Paper>
@@ -289,6 +295,7 @@ function Page() {
               siblings={1}
               boundaries={1}
               withEdges
+              fz={{ base: 'xs', md: 'sm' }}
             />
           </Center>
         </Stack>
diff --git a/src/app/darmasaba/(pages)/desa/potensi/[id]/page.tsx b/src/app/darmasaba/(pages)/desa/potensi/[id]/page.tsx
index fe8bf5fa..bd5ad518 100644
--- a/src/app/darmasaba/(pages)/desa/potensi/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/potensi/[id]/page.tsx
@@ -9,6 +9,7 @@ import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../../layanan/_com/BackButto';
 
+
 function Page() {
   const params = useParams<{ id: string }>();
   const id = Array.isArray(params.id) ? params.id[0] : params.id;
@@ -35,7 +36,9 @@ function Page() {
       <Center h="80vh">
         <Stack align="center" gap="md">
           <Loader size="lg" color="blue" />
-          <Text c="dimmed" fz="sm">Sedang memuat informasi...</Text>
+          <Text c="dimmed" fz={{ base: 'xs', md: 'sm' }} ta="center">
+            Sedang memuat informasi...
+          </Text>
         </Stack>
       </Center>
     );
@@ -46,28 +49,31 @@ function Page() {
       <Center h="80vh">
         <Stack align="center" gap="sm">
           <IconMoodSad size={64} stroke={1.5} color="var(--mantine-color-blue-6)" />
-          <Title order={3}>Data Tidak Ditemukan</Title>
-          <Text c="dimmed" fz="sm">Mohon periksa kembali atau coba beberapa saat lagi</Text>
+          <Title order={3} ta="center">
+            Data Tidak Ditemukan
+          </Title>
+          <Text c="dimmed" fz={{ base: 'xs', md: 'sm' }} ta="center">
+            Mohon periksa kembali atau coba beberapa saat lagi
+          </Text>
         </Stack>
       </Center>
     );
   }
 
   return (
-    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl" px={{ base: "md", md: 0 }}>
-      <Box px={{ base: "md", md: 100 }}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl" px={{ base: 'md', md: 0 }}>
+      <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Container w={{ base: "100%", md: "60%" }}>
+      <Container w={{ base: '100%', md: '60%' }}>
         <Paper radius="2xl" shadow="lg" p="xl" withBorder>
           <Stack gap="lg" align="center">
-            <Title ta="center" fz={{ base: "2rem", md: "3rem" }} c={colors["blue-button"]} fw={800}>
+            <Title order={1} ta="center" c={colors['blue-button']} fw={800}>
               {state.findUnique.data?.name}
             </Title>
-            <Text ta="center" fw={600} fz={{ base: "md", md: "lg" }} c="dimmed">
+            <Text ta="center" fw={600} fz={{ base: 'md', md: 'lg' }} c="dimmed">
               Informasi & Pelayanan Potensi Desa Digital
             </Text>
-            {/* ✅ Bagian gambar dibuat konsisten tanpa CSS manual */}
             <Box
               w="100%"
               h={{ base: 220, md: 400 }}
@@ -87,7 +93,15 @@ function Page() {
                 radius="lg"
               />
             </Box>
-            <Text py="md" fz={{ base: "sm", md: "md" }} ta="justify" lh={1.8} dangerouslySetInnerHTML={{ __html: state.findUnique.data?.deskripsi || 'Belum ada deskripsi untuk potensi desa ini.' }} />
+            <Text
+              py="md"
+              fz={{ base: 'sm', md: 'md' }}
+              ta="justify"
+              lh={{ base: 1.6, md: 1.8 }}
+              dangerouslySetInnerHTML={{
+                __html: state.findUnique.data?.content || 'Belum ada deskripsi untuk potensi desa ini.',
+              }}
+            />
           </Stack>
         </Paper>
       </Container>
@@ -95,4 +109,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/desa/potensi/page.tsx b/src/app/darmasaba/(pages)/desa/potensi/page.tsx
index b6a586b9..a618da20 100644
--- a/src/app/darmasaba/(pages)/desa/potensi/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/potensi/page.tsx
@@ -2,7 +2,7 @@
 'use client'
 import potensiDesaState from '@/app/admin/(dashboard)/_state/desa/potensi';
 import colors from '@/con/colors';
-import { BackgroundImage, Box, Button, Center, Flex, Group, Paper, SimpleGrid, Skeleton, Stack, Text } from '@mantine/core';
+import { BackgroundImage, Box, Button, Flex, Group, Paper, SimpleGrid, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { IconEye } from '@tabler/icons-react';
 import { useTransitionRouter } from 'next-view-transitions';
 import { useEffect, useState } from 'react';
@@ -41,10 +41,10 @@ function Page() {
       <Box px={{ base: "md", md: 100 }}>
         <Flex justify="space-between" align="center" direction={{ base: "column", md: "row" }} gap="lg">
           <Stack gap="sm" maw={600}>
-            <Text fz={{ base: "2rem", md: "3rem" }} fw={900} c={colors["blue-button"]} lh={1.2}>
+            <Title order={1} fz={{ base: 28, md: 36 }} lh={1.2} c={colors["blue-button"]}>
               Potensi Desa Darmasaba
-            </Text>
-            <Text fz="lg" ta="justify">
+            </Title>
+            <Text fz={{ base: 14, md: 16 }} lh={1.6} ta="justify">
               Temukan berbagai potensi unggulan, peluang, dan daya tarik yang menjadikan Desa Darmasaba istimewa.
             </Text>
           </Stack>
@@ -58,18 +58,18 @@ function Page() {
           >
             <Flex justify="center" align="center" gap="xl">
               <Box>
-                <Text ta="center" fz="2rem" fw={800} c="white">
+                <Text ta="center" fz={{ base: 20, md: 32 }} fw={800} c="white" lh={1.2}>
                   {data?.filter(item => item.kategori?.nama.toLowerCase() !== 'wisata').length || 0}
                 </Text>
-                <Text ta="center" fz="sm" c="white" fw={500}>
+                <Text ta="center" fz={{ base: 12, md: 14 }} c="white" fw={500}>
                   Potensi
                 </Text>
               </Box>
               <Box>
-                <Text ta="center" fz="2rem" fw={800} c="white">
+                <Text ta="center" fz={{ base: 20, md: 32 }} fw={800} c="white" lh={1.2}>
                   {data?.filter(item => item.kategori?.nama.toLowerCase() === 'wisata').length || 0}
                 </Text>
-                <Text ta="center" fz="sm" c="white" fw={500}>
+                <Text ta="center" fz={{ base: 12, md: 14 }} c="white" fw={500}>
                   Wisata
                 </Text>
               </Box>
@@ -91,45 +91,40 @@ function Page() {
                 radius="xl"
                 onMouseEnter={() => setHoveredId(v.id)}
                 onMouseLeave={() => setHoveredId(null)}
-                style={{ 
-                  overflow: 'hidden', 
+                style={{
+                  overflow: 'hidden',
                   position: 'relative',
                   cursor: 'pointer',
                   transition: 'transform 0.3s ease'
                 }}
               >
-                {/* Overlay with smooth transition */}
                 <Box
                   pos="absolute"
                   inset={0}
-                  bg={hoveredId === v.id 
-                    ? "linear-gradient(180deg, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0.75) 100%)" 
+                  bg={hoveredId === v.id
+                    ? "linear-gradient(180deg, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0.75) 100%)"
                     : "linear-gradient(180deg, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.15) 100%)"
                   }
                   style={{
                     transition: 'background 0.3s ease'
                   }}
                 />
-                
+
                 <Stack justify="space-between" h="100%" gap="md" p="lg" pos="relative">
-                  {/* Kategori badge - always visible */}
                   <Group>
-                    <Paper 
-                      radius="lg" 
-                      py={6} 
-                      px={12} 
-                      shadow="md" 
-                      withBorder 
+                    <Paper
+                      radius="lg"
+                      py={6}
+                      px={12}
+                      shadow="md"
+                      withBorder
                       bg="rgba(255,255,255,0.9)"
-                      style={{
-                        transition: 'all 0.3s ease'
-                      }}
+                      style={{ transition: 'all 0.3s ease' }}
                     >
-                      <Text fz="sm" fw={600}>{v.kategori?.nama}</Text>
+                      <Text fz={{ base: 11, md: 14 }} fw={600}>{v.kategori?.nama}</Text>
                     </Paper>
                   </Group>
 
-                  {/* Nama potensi - visible on hover */}
                   <Box
                     style={{
                       opacity: hoveredId === v.id ? 1 : 0,
@@ -138,20 +133,20 @@ function Page() {
                       pointerEvents: hoveredId === v.id ? 'auto' : 'none'
                     }}
                   >
-                    <Text
+                    <Title
+                      order={3}
                       fw={800}
                       c="white"
-                      fz="xl"
+                      fz={{ base: 18, md: 20 }}
                       ta="center"
                       lineClamp={2}
                       lh={1.3}
                     >
                       {v.name}
-                    </Text>
+                    </Title>
                   </Box>
 
-                  {/* Button - visible on hover */}
-                  <Group 
+                  <Group
                     justify="center"
                     style={{
                       opacity: hoveredId === v.id ? 1 : 0,
@@ -169,23 +164,21 @@ function Page() {
                       gradient={{ from: colors["blue-button"], to: "#4dabf7", deg: 45 }}
                       onClick={() => router.push(`/darmasaba/desa/potensi/${v.id}`)}
                     >
-                      Lihat Detail
+                      <Text c={'white'} fz={{ base: 12, md: 14 }} fw={500}>Lihat Detail</Text>
                     </Button>
                   </Group>
                 </Stack>
               </BackgroundImage>
             ))
           ) : (
-            <Center h={240}>
-              <Stack align="center" gap="xs">
-                <Text fz="lg" fw={600} c="dimmed">
-                  Belum ada potensi desa
-                </Text>
-                <Text fz="sm" c="dimmed">
-                  Data potensi akan tampil di sini setelah tersedia.
-                </Text>
-              </Stack>
-            </Center>
+            <Stack align="center" gap="xs">
+              <Text fz={{ base: 14, md: 16 }} fw={600} c="dimmed">
+                Belum ada potensi desa
+              </Text>
+              <Text fz={{ base: 12, md: 14 }} c="dimmed">
+                Data potensi akan tampil di sini setelah tersedia.
+              </Text>
+            </Stack>
           )}
         </SimpleGrid>
       </Box>
@@ -193,4 +186,4 @@ function Page() {
   );
 }
 
-export default Page;
\ No newline at end of file
+export default Page;
diff --git a/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/[id]/page.tsx b/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/[id]/page.tsx
index 5e9f9159..72144afa 100644
--- a/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/[id]/page.tsx
@@ -26,7 +26,6 @@ function DetailPegawaiUser() {
     statePegawai.findUnique.load(params?.id as string);
   }, []);
 
-
   if (!statePegawai.findUnique.data) {
     return (
       <Stack py="lg">
@@ -41,7 +40,7 @@ function DetailPegawaiUser() {
     <Box px={{ base: 'md', md: 100 }} py="xl">
       {/* Back button */}
       <Group mb="lg" px={{ base: 'md', md: 100 }}>
-        <BackButton/>
+        <BackButton />
       </Group>
 
       <Paper
@@ -69,11 +68,17 @@ function DetailPegawaiUser() {
           />
 
           {/* Nama & Jabatan */}
-          <Stack align="center" gap={2}>
-            <Title order={3} fw={700} c={colors['blue-button']}>
+          <Stack align="center" gap={4}>
+            {/* Title utama → H2 karena ini judul profil */}
+            <Title order={2} c={colors['blue-button']} lh={1.2}>
               {data.namaLengkap || '-'} {data.gelarAkademik || ''}
             </Title>
-            <Text fz="sm" c="dimmed">
+
+            <Text
+              fz={{ base: 'sm', md: 'md' }}
+              lh={1.4}
+              c="dimmed"
+            >
               {data.posisi?.nama || 'Posisi tidak tersedia'}
             </Text>
           </Stack>
@@ -82,7 +87,11 @@ function DetailPegawaiUser() {
         <Divider my="lg" />
 
         {/* Informasi Detail */}
-        <Stack gap="md">
+        <Stack gap="lg">
+          <Title order={3} lh={1.3}>
+            Informasi Pegawai
+          </Title>
+
           <InfoRow label="Email" value={data.email} />
           <InfoRow label="Telepon" value={data.telepon} />
           <InfoRow label="Alamat" value={data.alamat} multiline />
@@ -91,10 +100,10 @@ function DetailPegawaiUser() {
             value={
               data.tanggalMasuk
                 ? new Date(data.tanggalMasuk).toLocaleDateString('id-ID', {
-                  day: '2-digit',
-                  month: 'long',
-                  year: 'numeric',
-                })
+                    day: '2-digit',
+                    month: 'long',
+                    year: 'numeric',
+                  })
                 : '-'
             }
           />
@@ -123,11 +132,18 @@ function InfoRow({
 }) {
   return (
     <Box>
-      <Text fz="sm" fw={600} c="dark">
+      <Text
+        fz={{ base: 'sm', md: 'md' }}
+        fw={600}
+        lh={1.3}
+        c="dark"
+      >
         {label}
       </Text>
+
       <Text
-        fz="sm"
+        fz={{ base: 'sm', md: 'md' }}
+        lh={1.5}
         c={valueColor || 'dimmed'}
         style={{
           whiteSpace: multiline ? 'normal' : 'nowrap',
diff --git a/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/page.tsx b/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/page.tsx
index bc4b3300..598238e0 100644
--- a/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/page.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/struktur-perangkat-desa/page.tsx
@@ -36,11 +36,12 @@ import { useTransitionRouter } from 'next-view-transitions'
 import { OrganizationChart } from 'primereact/organizationchart'
 import { useEffect, useRef, useState } from 'react'
 import { useProxy } from 'valtio/utils'
-import './struktur.css'
-import BackButton from '../_com/BackButto'
-import { useMediaQuery } from '@mantine/hooks'
 
-export default function StrukturPerangkatDesa() {
+import './struktur.css'
+import { useMediaQuery } from '@mantine/hooks'
+import BackButton from '../_com/BackButto'
+
+export default function Page() {
   return (
     <Box
       style={{
@@ -59,10 +60,11 @@ export default function StrukturPerangkatDesa() {
             ta="center"
             c={colors['blue-button']}
             fz={{ base: 28, md: 36, lg: 44 }}
+            lh={{ base: 1.05, md: 1.03 }}
           >
             Struktur Perangkat Desa
           </Title>
-          <Text ta="center" c="black" maw={800}>
+          <Text ta="center" c="black" maw={800} fz={{ base: 13, md: 15 }} lh={1.45}>
             Gambaran visual peran dan pegawai yang ditugaskan. Arahkan kursor
             untuk melihat detail atau klik node untuk fokus tampilan.
           </Text>
@@ -105,8 +107,8 @@ function StrukturPerangkatDesaNode() {
       <Center py={48}>
         <Stack align="center" gap="sm">
           <Loader size="lg" />
-          <Text fw={600}>Memuat struktur organisasi…</Text>
-          <Text c="dimmed" size="sm">
+          <Text fw={600} fz={{ base: 15, md: 16 }} lh={1.2}>Memuat struktur organisasi…</Text>
+          <Text c="dimmed" fz={{ base: 12, md: 13 }} lh={1.4}>
             Mengambil data pegawai dan posisi. Mohon tunggu sebentar.
           </Text>
         </Stack>
@@ -132,10 +134,10 @@ function StrukturPerangkatDesaNode() {
             <Center>
               <IconUsers size={56} />
             </Center>
-            <Title order={3} mt="md">
+            <Title order={3} mt="md" fz={{ base: 16, md: 18 }} lh={1.15}>
               Data pegawai belum tersedia
             </Title>
-            <Text c="dimmed" mt="xs">
+            <Text c="dimmed" mt="xs" fz={{ base: 13, md: 14 }} lh={1.4}>
               Belum ada data pegawai yang tercatat untuk PPID.
             </Text>
             <Group justify="center" mt="lg">
@@ -232,11 +234,18 @@ function StrukturPerangkatDesaNode() {
       {/* 🔍 Controls */}
       <Paper
         shadow="xs"
+        w={{
+          base: '100%',       // Mobile: 100%
+          sm: '40%',          // Tablet: 95%
+          md: '39%',          // Desktop: 70%
+          lg: '38%',          // Desktop L: 60%
+          xl: '37%',          // 4K: 50%
+          '2xl': '36%',       // Ultra-wide: 45%
+        }}
         p="md"
         radius="md"
         style={{
-          background: colors['blue-button'],
-          width: '100%',       // ⬅️ penting
+          background: colors['blue-button'],       // ⬅️ penting
           maxWidth: '100%',    // ⬅️ penting
           overflowX: 'auto'    // ⬅️ untuk mencegah overflow
         }}
@@ -269,30 +278,33 @@ function StrukturPerangkatDesaNode() {
                 fontSize: '0.875rem',
                 padding: '6px 12px',
                 minHeight: 'auto',
-                flexShrink: 0, // 👈 PENTING: mencegah tab mengecil
+                flexShrink: 0,
               },
             }}
+            style={{ width: '100%' }} // 👈 penting
           >
             <TabsList
               style={{
                 display: 'flex',
                 overflowX: 'auto',
-                overflowY: 'hidden', // 👈 tambahkan ini
+                overflowY: 'hidden',
                 gap: '4px',
                 paddingBottom: '4px',
                 flexWrap: 'nowrap',
-                WebkitOverflowScrolling: 'touch', // 👈 smooth scroll di iOS
-                scrollbarWidth: 'thin', // 👈 scrollbar tipis di Firefox
-                msOverflowStyle: '-ms-autohiding-scrollbar', // 👈 untuk IE/Edge
+                WebkitOverflowScrolling: 'touch',
+                scrollbarWidth: 'thin',
+                msOverflowStyle: '-ms-autohiding-scrollbar',
+                maxWidth: '100%',
+                scrollBehavior: 'smooth', // 👈 smooth scroll
               }}
             >
               <TabsTab
                 value="zoom-out"
                 onClick={handleZoomOut}
                 leftSection={<IconZoomOut size={16} />}
-                style={{ flexShrink: 0 }} // 👈 pastikan tidak mengecil
+                style={{ flexShrink: 0 }}
               >
-                Zoom Out
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">Zoom Out</Text>
               </TabsTab>
 
               <Box
@@ -301,7 +313,6 @@ function StrukturPerangkatDesaNode() {
                 px={12}
                 py={6}
                 style={{
-                  fontSize: 14,
                   fontWeight: 700,
                   borderRadius: '6px',
                   minWidth: 60,
@@ -310,10 +321,12 @@ function StrukturPerangkatDesaNode() {
                   alignItems: 'center',
                   justifyContent: 'center',
                   flexShrink: 0,
-                  whiteSpace: 'nowrap', // 👈 mencegah text wrap
+                  whiteSpace: 'nowrap',
                 }}
               >
-                {Math.round(scale * 100)}%
+                <Text fz={{ base: 12, sm: 13 }} lh={1} c={colors['blue-button']}>
+                  {Math.round(scale * 100)}%
+                </Text>
               </Box>
 
               <TabsTab
@@ -322,7 +335,7 @@ function StrukturPerangkatDesaNode() {
                 leftSection={<IconZoomIn size={16} />}
                 style={{ flexShrink: 0 }}
               >
-                Zoom In
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">Zoom In</Text>
               </TabsTab>
 
               <TabsTab
@@ -330,7 +343,7 @@ function StrukturPerangkatDesaNode() {
                 onClick={resetZoom}
                 style={{ flexShrink: 0 }}
               >
-                Reset
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">Reset</Text>
               </TabsTab>
 
               <TabsTab
@@ -345,7 +358,9 @@ function StrukturPerangkatDesaNode() {
                 }
                 style={{ flexShrink: 0 }}
               >
-                {isFullscreen ? 'Exit' : 'Fullscreen'}
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">
+                  {isFullscreen ? 'Exit' : 'Fullscreen'}
+                </Text>
               </TabsTab>
             </TabsList>
           </Tabs>
@@ -451,17 +466,17 @@ function NodeCard({ node, router }: any) {
             {/* Name */}
             <Text
               fw={700}
-              size="sm"
               ta="center"
               c={colors['blue-button']}
               lineClamp={2}
+              fz={{ base: 13, md: 15 }}
+              lh={1.2}
               style={{
                 minHeight: 40,
                 display: 'flex',
                 alignItems: 'center',
                 justifyContent: 'center',
                 wordBreak: 'break-word',
-                lineHeight: 1.3,
               }}
             >
               {name}
@@ -469,18 +484,18 @@ function NodeCard({ node, router }: any) {
 
             {/* Title/Position */}
             <Text
-              size="xs"
               c="dimmed"
               ta="center"
               fw={500}
               lineClamp={2}
+              fz={{ base: 12, md: 13 }}
+              lh={1.3}
               style={{
                 minHeight: 32,
                 display: 'flex',
                 alignItems: 'center',
                 justifyContent: 'center',
                 wordBreak: 'break-word',
-                lineHeight: 1.2,
               }}
             >
               {title}
@@ -496,14 +511,14 @@ function NodeCard({ node, router }: any) {
                 mt={8}
                 radius="md"
                 onClick={() =>
-                  router.push(`/darmasaba/desa/profile/struktur-perangkat-desa/${node.data.id}`)
+                   router.push(`/darmasaba/desa/profil/struktur-perangkat-desa/${node.data.id}`)
                 }
                 style={{
                   height: 32,
                   fontWeight: 600,
                 }}
               >
-                Lihat Detail
+                <Text fz={{ base: 12, md: 13 }} lh={1} ta="center">Lihat Detail</Text>
               </Button>
             )}
           </Stack>
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/lambangDesa.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/lambangDesa.tsx
index 9ad92167..d9b371ff 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/lambangDesa.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/lambangDesa.tsx
@@ -2,7 +2,7 @@
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile'
 import colors from '@/con/colors'
-import { Box, Center, Image, Paper, Skeleton, Stack, Text } from '@mantine/core'
+import { Box, Center, Image, Paper, Skeleton, Stack, Text, Title } from '@mantine/core'
 import { useEffect } from 'react'
 import { useProxy } from 'valtio/utils'
 
@@ -26,6 +26,8 @@ function LambangDesa() {
   return (
     <Box>
       <Stack align="center" gap="lg">
+        
+        {/* HEADER */}
         <Box pb="lg">
           <Center>
             <Image
@@ -36,17 +38,20 @@ function LambangDesa() {
               loading="lazy"
             />
           </Center>
-          <Text
+
+          {/* TITLE - H1 */}
+          <Title
+            order={1}
             c={colors['blue-button']}
             ta="center"
-            fw={800}
-            fz={{ base: 28, md: 40 }}
             mt="sm"
             style={{ letterSpacing: '-0.5px' }}
           >
             Lambang Desa
-          </Text>
+          </Title>
         </Box>
+
+        {/* DESKRIPSI */}
         <Paper
           p="xl"
           radius="xl"
@@ -58,15 +63,20 @@ function LambangDesa() {
             borderColor: '#e0e9ff',
           }}
         >
-            <Text
-              fz={{ base: '1.125rem', md: '1.375rem' }}
-              lh={1.8}
-              c="dark"
-              ta="justify"
-              style={{ fontWeight: 400, wordBreak: "break-word", whiteSpace: "normal", }}
-              dangerouslySetInnerHTML={{ __html: data.deskripsi }}
-            />
+          <Text
+            fz={{ base: 'sm', md: 'md' }}   // Body text mobile & desktop
+            lh={1.7}
+            c="dark"
+            ta="justify"
+            style={{
+              fontWeight: 400,
+              wordBreak: "break-word",
+              whiteSpace: "normal",
+            }}
+            dangerouslySetInnerHTML={{ __html: data.deskripsi }}
+          />
         </Paper>
+
       </Stack>
     </Box>
   )
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/maskotDesa.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/maskotDesa.tsx
index 4f0ad9ea..88e6e496 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/maskotDesa.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/maskotDesa.tsx
@@ -2,7 +2,7 @@
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
 import colors from '@/con/colors';
-import { Box, Card, Center, Group, Image, Loader, Paper, Stack, Text } from '@mantine/core';
+import { Box, Card, Center, Group, Image, Loader, Paper, Stack, Text, Title } from '@mantine/core';
 import { IconPhoto } from '@tabler/icons-react';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -21,7 +21,9 @@ function MaskotDesa() {
       <Center mih={500}>
         <Stack align="center" gap="sm">
           <Loader size="lg" color="blue" />
-          <Text c="dimmed" fz="sm">Sedang memuat data maskot desa...</Text>
+          <Text c="dimmed" fz={{ base: 'xs', md: 'sm' }}>
+            Sedang memuat data maskot desa...
+          </Text>
         </Stack>
       </Center>
     );
@@ -31,8 +33,21 @@ function MaskotDesa() {
     <Box>
       <Stack align="center" gap="xl">
         <Stack align="center" gap={10}>
-          <Image src="/pudak-icon.png" alt="Ikon Desa" w={{ base: 160, md: 240 }} loading="lazy"/>
-          <Text c={colors['blue-button']} ta="center" fw={700} fz={{ base: 28, md: 36 }}>Maskot Desa</Text>
+          <Image
+            src="/pudak-icon.png"
+            alt="Ikon Desa"
+            w={{ base: 160, md: 240 }}
+            loading="lazy"
+          />
+
+          {/* Page Title */}
+          <Title
+            order={1}
+            ta="center"
+            c={colors['blue-button']}
+          >
+            Maskot Desa
+          </Title>
         </Stack>
 
         <Paper
@@ -42,48 +57,60 @@ function MaskotDesa() {
           withBorder
           style={{ background: 'linear-gradient(145deg, #ffffff, #f8f9fa)' }}
         >
+          {/* Body Description */}
           <Text
             fz={{ base: 'sm', md: 'lg' }}
             lh={1.7}
             ta="justify"
             c="dark"
             dangerouslySetInnerHTML={{ __html: data.deskripsi }}
-            style={{wordBreak: "break-word", whiteSpace: "normal"}}
+            style={{ wordBreak: 'break-word', whiteSpace: 'normal' }}
           />
 
           <Group justify="center" gap="lg" mt="lg">
             {data.images.length > 0 ? (
               data.images.map((img, index) => (
-                  <Card
+                <Card
                   key={index}
-                    radius="lg"
-                    shadow="md"
-                    withBorder
-                    w={220}
-                    p="sm"
-                    style={{
-                      transition: 'transform 200ms ease, box-shadow 200ms ease',
-                    }}
-                    className="hover:scale-105 hover:shadow-lg"
+                  radius="lg"
+                  shadow="md"
+                  withBorder
+                  w={220}
+                  p="sm"
+                  style={{
+                    transition: 'transform 200ms ease, box-shadow 200ms ease',
+                  }}
+                  className="hover:scale-105 hover:shadow-lg"
+                >
+                  <Image
+                    src={img.image.link}
+                    alt={img.label}
+                    w="100%"
+                    h={200}
+                    fit="cover"
+                    radius="md"
+                    loading="lazy"
+                  />
+
+                  {/* Image Label */}
+                  <Text
+                    ta="center"
+                    mt="sm"
+                    fw={600}
+                    fz={{ base: 'xs', md: 'sm' }}
+                    c="dark"
                   >
-                    <Image
-                      src={img.image.link}
-                      alt={img.label}
-                      w="100%"
-                      h={200}
-                      fit="cover"
-                      radius="md"
-                      loading="lazy"
-                    />
-                    <Text ta="center" mt="sm" fw={600} fz="sm" c="dark">
-                      {img.label}
-                    </Text>
-                  </Card>
+                    {img.label}
+                  </Text>
+                </Card>
               ))
             ) : (
               <Stack align="center" gap="xs" mt="lg">
                 <IconPhoto size={48} stroke={1.5} color="gray" />
-                <Text c="dimmed" fz="sm">Belum ada gambar maskot yang ditambahkan</Text>
+                
+                <Text c="dimmed" fz={{ base: 'xs', md: 'sm' }}>
+                  Belum ada gambar maskot yang ditambahkan
+                </Text>
               </Stack>
             )}
           </Group>
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/motoDesa.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/motoDesa.tsx
index 53e73d55..d62acc56 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/motoDesa.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/motoDesa.tsx
@@ -1,35 +1,15 @@
 'use client'
-import { ActionIcon, Box, Flex, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
+import { ActionIcon, Box, Flex, Paper, SimpleGrid, Stack, Text, Title } from '@mantine/core';
 import { motion } from 'framer-motion';
 import { IconSparkles } from '@tabler/icons-react';
 import colors from '@/con/colors';
 
 const dataText = [
-  {
-    id: 1,
-    title: "Santun",
-    description: "Pelayanan ramah, penuh empati, sopan, dan beretika."
-  },
-  {
-    id: 2,
-    title: "Adaptif",
-    description: "Cepat menyesuaikan diri terhadap perubahan dan selalu proaktif."
-  },
-  {
-    id: 3,
-    title: "Inovatif",
-    description: "Berani menciptakan pembaruan dan ide-ide kreatif."
-  },
-  {
-    id: 4,
-    title: "Profesional",
-    description: "Berpengetahuan luas, terampil, dan bertanggung jawab."
-  },
-  {
-    id: 5,
-    title: "Gesit",
-    description: "Cekatan, sigap, dan penuh inisiatif dalam bekerja."
-  },
+  { id: 1, title: "Santun", description: "Pelayanan ramah, penuh empati, sopan, dan beretika." },
+  { id: 2, title: "Adaptif", description: "Cepat menyesuaikan diri terhadap perubahan dan selalu proaktif." },
+  { id: 3, title: "Inovatif", description: "Berani menciptakan pembaruan dan ide-ide kreatif." },
+  { id: 4, title: "Profesional", description: "Berpengetahuan luas, terampil, dan bertanggung jawab." },
+  { id: 5, title: "Gesit", description: "Cekatan, sigap, dan penuh inisiatif dalam bekerja." },
 ];
 
 const letters = ["S", "I", "G", "A", "P"];
@@ -38,11 +18,14 @@ function MotoDesa() {
   return (
     <Box px={{ base: "md", md: "xl" }}>
       <Stack align="center" gap="lg">
+        {/* Page Title */}
         <Box>
-          <Text
+          <Title
+            order={1}
             ta="center"
             fw={800}
-            fz={{ base: "2rem", md: "2.8rem" }}
+            fz={{ base: 28, md: 36 }}
+            lh={{ base: 1.2, md: 1.3 }}
             style={{
               background: "linear-gradient(90deg, #0D5594FF, #094678FF)",
               WebkitBackgroundClip: "text",
@@ -50,9 +33,10 @@ function MotoDesa() {
             }}
           >
             Moto Desa Darmasaba
-          </Text>
+          </Title>
         </Box>
 
+        {/* Letter Icons */}
         <Flex gap={30} pb={40} pt={10} wrap="wrap" justify="center">
           {letters.map((letter, i) => (
             <motion.div
@@ -71,7 +55,7 @@ function MotoDesa() {
                   backdropFilter: "blur(6px)",
                 }}
               >
-                <Text c="white" fw={800} fz="xl">
+                <Text c="white" fw={800} fz={{ base: 20, md: 24 }}>
                   {letter}
                 </Text>
               </ActionIcon>
@@ -79,6 +63,7 @@ function MotoDesa() {
           ))}
         </Flex>
 
+        {/* Values Card */}
         <Paper
           radius="lg"
           p="xl"
@@ -90,19 +75,22 @@ function MotoDesa() {
         >
           <SimpleGrid cols={{ base: 1, md: 2 }} spacing="xl">
             {dataText.map((v) => (
-              <motion.div
-                key={v.id}
-                whileHover={{ scale: 1.02 }}
-                transition={{ duration: 0.2 }}
-              >
+              <motion.div key={v.id} whileHover={{ scale: 1.02 }} transition={{ duration: 0.2 }}>
                 <Stack gap={4}>
+                  {/* Section Title */}
                   <Flex align="center" gap="sm">
                     <IconSparkles size={20} color={colors['blue-button']} />
-                    <Text fw={700} fz={{ base: "lg", md: "xl" }} c={colors['blue-button']}>
+                    <Title
+                      order={3}
+                      fw={700}
+                      fz={{ base: 20, md: 24 }}
+                      c={colors['blue-button']}
+                    >
                       {v.title}
-                    </Text>
+                    </Title>
                   </Flex>
-                  <Text fz={{ base: "sm", md: "md" }} c="gray.7">
+                  {/* Body Text */}
+                  <Text fz={{ base: 14, md: 16 }} lh={{ base: 1.5, md: 1.6 }} c="gray.7">
                     {v.description}
                   </Text>
                 </Stack>
@@ -111,16 +99,15 @@ function MotoDesa() {
           </SimpleGrid>
         </Paper>
 
+        {/* Motto Description */}
         <Text
           ta="center"
           fw={700}
-          fz={{ base: "md", md: "xl" }}
+          fz={{ base: 15, md: 20 }}
+          lh={{ base: 1.6, md: 1.8 }}
           c="blue.8"
           mt="md"
-          style={{
-            maxWidth: 720,
-            lineHeight: 1.6,
-          }}
+          style={{ maxWidth: 720 }}
         >
           &quot;Berkomitmen menghadirkan pelayanan terbaik dengan semangat{" "}
           <Text span fw={800} c="cyan.6">
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/profilPerbekel.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/profilPerbekel.tsx
index 31611cf4..4a57cd5f 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/profilPerbekel.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/profilPerbekel.tsx
@@ -2,44 +2,45 @@
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
 import colors from '@/con/colors';
-import { Box, Divider, Image, Paper, SimpleGrid, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Divider, Image, Paper, SimpleGrid, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { IconBriefcase, IconTargetArrow, IconUser, IconUsers } from '@tabler/icons-react';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
 
 function ProfilPerbekel() {
-  const state = useProxy(stateProfileDesa.profilPerbekel)
+  const state = useProxy(stateProfileDesa.profilPerbekel);
 
   useEffect(() => {
-    state.findUnique.load("edit")
-  }, [])
+    state.findUnique.load("edit");
+  }, []);
 
-  const { data, loading } = state.findUnique
+  const { data, loading } = state.findUnique;
 
   if (loading || !data) {
     return (
       <Box py={20} px="md">
         <Skeleton h={500} radius="lg" />
       </Box>
-    )
+    );
   }
 
   return (
     <Box px="md">
+      {/* ===== PAGE TITLE ===== */}
       <Stack align="center" gap={0} mb={40}>
-        <Text
+        <Title
+          order={1}
           c={colors['blue-button']}
           ta="center"
-          fw="bold"
-          fz={{ base: "2rem", md: "2.8rem" }}
           style={{ letterSpacing: "0.5px" }}
         >
           Profil Perbekel
-        </Text>
+        </Title>
         <Divider w={120} size="sm" color={colors['blue-button']} mt={10} />
       </Stack>
 
       <SimpleGrid cols={{ base: 1, md: 2 }} spacing="xl" pb={50}>
+        {/* ========== FOTO PERBEKEL ========== */}
         <Box>
           <Paper
             bg={colors['white-trans-1']}
@@ -60,6 +61,8 @@ function ProfilPerbekel() {
                 }}
                 loading="lazy"
               />
+
+              {/* ===== NAMA DAN JABATAN ===== */}
               <Paper
                 bg={colors['blue-button']}
                 px="lg"
@@ -67,22 +70,23 @@ function ProfilPerbekel() {
                 className="glass3"
                 py={{ base: 20, md: 50 }}
               >
-                <Text c={colors['white-1']} fz={{ base: "lg", md: "h3" }}>
+                <Title order={3} c={colors['white-1']}>
                   Perbekel Desa Darmasaba
-                </Text>
-                <Text
+                </Title>
+
+                <Title
+                  order={2}
                   c={colors['white-1']}
-                  fw="bolder"
-                  fz={{ base: "xl", md: "h2" }}
                   mt={8}
                 >
                   {"I.B. Surya Prabhawa Manuaba, S.H.,M.H.,NL.P."}
-                </Text>
+                </Title>
               </Paper>
             </Stack>
           </Paper>
         </Box>
 
+        {/* ========== BIODATA & PENGALAMAN ========== */}
         <Paper
           p="xl"
           bg={colors['white-trans-1']}
@@ -92,34 +96,39 @@ function ProfilPerbekel() {
           withBorder
         >
           <Stack gap="xl">
+
+            {/* ===== BIODATA ===== */}
             <Box>
               <Stack gap={6}>
                 <Stack align="center" gap={6}>
                   <IconUser size={22} />
-                  <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Biodata</Text>
+                  <Title order={3}>Biodata</Title>
                 </Stack>
+
                 <Text
-                  fz={{ base: "1rem", md: "1.2rem" }}
+                  fz={{ base: "sm", md: "md" }}
                   ta="justify"
-                  lh={1.6}
+                  lh={1.7}
                   dangerouslySetInnerHTML={{ __html: data.biodata }}
-                  style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                  style={{ wordBreak: "break-word" }}
                 />
               </Stack>
             </Box>
 
+            {/* ===== PENGALAMAN ===== */}
             <Box>
               <Stack gap={6}>
                 <Stack align="center" gap={6}>
                   <IconBriefcase size={22} />
-                  <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Pengalaman</Text>
+                  <Title order={3}>Pengalaman</Title>
                 </Stack>
+
                 <Text
-                  fz={{ base: "1rem", md: "1.2rem" }}
+                  fz={{ base: "sm", md: "md" }}
                   ta="left"
-                  lh={1.6}
+                  lh={1.7}
                   dangerouslySetInnerHTML={{ __html: data.pengalaman }}
-                  style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                  style={{ wordBreak: "break-word" }}
                 />
               </Stack>
             </Box>
@@ -127,6 +136,7 @@ function ProfilPerbekel() {
         </Paper>
       </SimpleGrid>
 
+      {/* ========== ORGANISASI & PROGRAM UNGGULAN ========== */}
       <Paper
         p="xl"
         bg={colors['white-trans-1']}
@@ -136,35 +146,41 @@ function ProfilPerbekel() {
         withBorder
       >
         <Stack gap="xl">
+
+          {/* ===== PENGALAMAN ORGANISASI ===== */}
           <Box>
-            <Stack align="center" gap={6} >
+            <Stack align="center" gap={6}>
               <IconUsers size={22} />
-              <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Pengalaman Organisasi</Text>
+              <Title order={3}>Pengalaman Organisasi</Title>
             </Stack>
+
             <Text
-              fz={{ base: "1rem", md: "1.2rem" }}
+              fz={{ base: "sm", md: "md" }}
               ta="justify"
-              lh={1.6}
+              lh={1.7}
               dangerouslySetInnerHTML={{ __html: data.pengalamanOrganisasi }}
-              style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+              style={{ wordBreak: "break-word" }}
             />
           </Box>
 
+          {/* ===== PROGRAM UNGGULAN ===== */}
           <Box>
             <Stack align="center" gap={6} mb={6}>
               <IconTargetArrow size={22} />
-              <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Program Kerja Unggulan</Text>
+              <Title order={3}>Program Kerja Unggulan</Title>
             </Stack>
+
             <Box px={10}>
               <Text
-                fz={{ base: "1rem", md: "1.2rem" }}
+                fz={{ base: "sm", md: "md" }}
                 ta="justify"
-                lh={1.6}
+                lh={1.7}
                 dangerouslySetInnerHTML={{ __html: data.programUnggulan }}
-                style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                style={{ wordBreak: "break-word" }}
               />
             </Box>
           </Box>
+
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/sejarahDesa.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/sejarahDesa.tsx
index 1acc52f1..5913f70d 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/sejarahDesa.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/sejarahDesa.tsx
@@ -2,7 +2,7 @@
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
 import colors from '@/con/colors';
-import { Box, Center, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Center, Image, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
 
@@ -26,29 +26,32 @@ function SejarahDesa() {
   return (
     <Box>
       <Stack align="center" gap="xl">
+        {/* HEADER ICON + TITLE */}
         <Stack align="center" gap="sm">
           <Center>
             <Image
               src="/darmasaba-icon.png"
               alt="Ikon Desa Darmasaba"
-              w={{ base: 180, md: 260 }}
+              w={{ base: 160, md: 240 }}
               radius="md"
               style={{ filter: 'drop-shadow(0 4px 12px rgba(0,0,0,0.15))' }}
               loading="lazy"
             />
           </Center>
+
           <Center>
-            <Text
+            <Title
+              order={1}
               c={colors['blue-button']}
               ta="center"
-              fw={700}
-              fz={{ base: '2rem', md: '2.8rem' }}
               style={{ letterSpacing: '-0.5px' }}
             >
               Sejarah Desa
-            </Text>
+            </Title>
           </Center>
         </Stack>
+
+        {/* CONTENT */}
         <Paper
           p="xl"
           radius="lg"
@@ -61,10 +64,14 @@ function SejarahDesa() {
         >
           <Stack gap="md">
             <Text
-              fz={{ base: 'md', md: 'lg' }}
-              lh={1.8}
+              fz={{ base: 'sm', md: 'md' }}
+              lh={1.75}
               ta="justify"
-              style={{ color: '#2a2a2a', wordBreak: "break-word", whiteSpace: "normal" }}
+              c="dark.7"
+              style={{
+                wordBreak: 'break-word',
+                whiteSpace: 'normal',
+              }}
               dangerouslySetInnerHTML={{ __html: data.deskripsi }}
             />
           </Stack>
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/semuaPerbekel.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/semuaPerbekel.tsx
index 29bc2809..cedd9d71 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/semuaPerbekel.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/semuaPerbekel.tsx
@@ -28,8 +28,10 @@ function SemuaPerbekel() {
       <Center py="xl">
         <Stack align="center" gap="sm">
           <IconUser size={48} stroke={1.5} />
-          <Title fw="bold" order={2}>Belum ada data Perbekel</Title>
-          <Text c="dimmed" fz="sm" ta="center">Data mantan Perbekel akan muncul di sini ketika sudah tersedia</Text>
+          <Title order={2} ta="center">Belum ada data Perbekel</Title>
+          <Text c="dimmed" fz={{ base: 'xs', md: 'sm' }} lh={{ base: 1.4, md: 1.6 }} ta="center">
+            Data mantan Perbekel akan muncul di sini ketika sudah tersedia
+          </Text>
         </Stack>
       </Center>
     );
@@ -38,17 +40,20 @@ function SemuaPerbekel() {
   return (
     <Box>
       <Stack align="center" gap="lg">
-        <Box>
-          <Text
-            ta="center"
-            fw={900}
-            fz={{ base: "2rem", md: "2.5rem" }}
-            variant="gradient"
-            gradient={{ from: "blue", to: "cyan", deg: 45 }}
-          >
-            Perbekel Dari Masa ke Masa
-          </Text>
-        </Box>
+        <Title
+          order={1}
+          ta="center"
+          style={{
+            background: 'linear-gradient(45deg, blue, cyan)',
+            WebkitBackgroundClip: 'text',
+            WebkitTextFillColor: 'transparent',
+          }}
+          fz={{ base: 28, md: 36 }}
+          lh={{ base: 1.2, md: 1.3 }}
+          fw={900}
+        >
+          Perbekel Dari Masa ke Masa
+        </Title>
 
         <SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="xl" w="100%">
           {data.map((v: any, k: number) => (
@@ -59,9 +64,7 @@ function SemuaPerbekel() {
               withBorder
               p="lg"
               bg="white"
-              style={{
-                transition: "all 250ms ease",
-              }}
+              style={{ transition: "all 250ms ease" }}
               className="hover:shadow-xl hover:scale-[1.02]"
             >
               <Stack gap="md" align="center">
@@ -77,17 +80,17 @@ function SemuaPerbekel() {
                 </Box>
 
                 <Stack gap={4} align="center">
-                    <Text fw={700} fz="lg" ta="center">
-                      {v.nama}
-                    </Text>
+                  <Title order={3} fz={{ base: 18, md: 20 }} ta="center" fw={700}>
+                    {v.nama}
+                  </Title>
 
-                  <Text c="dimmed" fz="sm" ta="center">
-                      {v.daerah}
-                    </Text>
+                  <Text c="dimmed" fz={{ base: 12, md: 14 }} lh={{ base: 1.4, md: 1.6 }} ta="center">
+                    {v.daerah}
+                  </Text>
 
-                  <Text c="blue" fw={600} fz="sm" ta="center">
-                      {v.periode}
-                    </Text>
+                  <Text c="blue" fw={600} fz={{ base: 12, md: 14 }} lh={{ base: 1.4, md: 1.6 }} ta="center">
+                    {v.periode}
+                  </Text>
                 </Stack>
               </Stack>
             </Paper>
diff --git a/src/app/darmasaba/(pages)/desa/profil/ui/visimisiDesa.tsx b/src/app/darmasaba/(pages)/desa/profil/ui/visimisiDesa.tsx
index 25ff3c81..26ef0ee2 100644
--- a/src/app/darmasaba/(pages)/desa/profil/ui/visimisiDesa.tsx
+++ b/src/app/darmasaba/(pages)/desa/profil/ui/visimisiDesa.tsx
@@ -2,7 +2,7 @@
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
 import colors from '@/con/colors';
-import { Box, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Image, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
 
@@ -34,60 +34,57 @@ function VisiMisiDesa() {
           loading="lazy"
         />
 
+        {/* VISI */}
         <Paper
           p="xl"
           radius="lg"
           shadow="md"
           withBorder
           w="100%"
-          style={{
-            background: 'linear-gradient(145deg, #ffffff, #f5f7fa)',
-          }}
+          style={{ background: 'linear-gradient(145deg, #ffffff, #f5f7fa)' }}
         >
-          <Text
+          <Title
+            order={1}
             c={colors['blue-button']}
             ta="center"
-            fw={700}
-            fz={{ base: '2rem', md: '2.5rem' }}
             mb="md"
           >
             Visi Desa
-          </Text>
+          </Title>
+
           <Text
-            fz={{ base: '1.125rem', md: '1.375rem' }}
+            fz={{ base: 'sm', md: 'md' }}   // body text responsive
+            lh={1.7}
             ta="center"
-            fw={500}
-            lh={1.6}
             dangerouslySetInnerHTML={{ __html: data.visi }}
-            style={{wordBreak: "break-word", whiteSpace: "normal"}}
+            style={{ wordBreak: 'break-word', whiteSpace: 'normal' }}
           />
         </Paper>
 
+        {/* MISI */}
         <Paper
           p="xl"
           radius="lg"
           shadow="md"
           withBorder
           w="100%"
-          style={{
-            background: 'linear-gradient(145deg, #ffffff, #f5f7fa)',
-          }}
+          style={{ background: 'linear-gradient(145deg, #ffffff, #f5f7fa)' }}
         >
-          <Text
+          <Title
+            order={1}
             c={colors['blue-button']}
             ta="center"
-            fw={700}
-            fz={{ base: '2rem', md: '2.5rem' }}
             mb="md"
           >
             Misi Desa
-          </Text>
+          </Title>
+
           <Text
-            fz={{ base: '1.125rem', md: '1.375rem' }}
-            fw={500}
-            lh={1.6}
+            fz={{ base: 'sm', md: 'md' }}   // body text responsive
+            lh={1.7}
+            ta="left"
             dangerouslySetInnerHTML={{ __html: data.misi }}
-            style={{wordBreak: "break-word", whiteSpace: "normal"}}
+            style={{ wordBreak: 'break-word', whiteSpace: 'normal' }}
           />
         </Paper>
       </Stack>
diff --git a/src/app/darmasaba/(pages)/ekonomi/PADesa-pendapatan-asli-desa/page.tsx b/src/app/darmasaba/(pages)/ekonomi/PADesa-pendapatan-asli-desa/page.tsx
index de14a1e1..bdc25c4d 100644
--- a/src/app/darmasaba/(pages)/ekonomi/PADesa-pendapatan-asli-desa/page.tsx
+++ b/src/app/darmasaba/(pages)/ekonomi/PADesa-pendapatan-asli-desa/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Grid, GridCol, Paper, SimpleGrid, Stack, Table, Text, Title } from '@mantine/core';
+import { Box, Flex, Group, Paper, SimpleGrid, Stack, Table, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../../desa/layanan/_com/BackButto';
@@ -30,196 +30,265 @@ function Page() {
   // Hasil akhir
   const sisaAnggaran = totalPendapatan - totalBelanja - totalPembiayaan;
 
+  const formatCurrency = (value: number) => {
+    return new Intl.NumberFormat('id-ID', {
+      style: 'currency',
+      currency: 'IDR',
+      minimumFractionDigits: 0
+    }).format(value);
+  };
+
   return (
     <Stack pos="relative" bg={colors.Bg} py="xl" gap="lg">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Text ta="center" fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw="bold">
+
+      {/* Page Title */}
+      <Title
+        ta="center"
+        c={colors["blue-button"]}
+        fw="bold"
+        order={1}
+        fz={{ base: 28, md: 36 }}
+      >
         Pendapatan Asli Desa
-      </Text>
+      </Title>
+
       <Box px={{ base: "md", md: 100 }}>
         <Stack gap="lg" justify="center">
-          <Paper bg={colors['white-1']} p="xl">
-            <SimpleGrid cols={{ base: 1, md: 3 }} spacing="md">
+          <Paper bg={colors['white-1']} p={{ base: 'md', md: 'xl' }}>
+            <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
               {/* Pendapatan Card */}
-              <Box p="md" style={{ border: '1px solid #e9ecef', borderRadius: '8px' }}>
-                <Stack gap={"xs"}>
-                  <Title order={3}>Pendapatan</Title>
-                  {latestApb?.pendapatan?.map((item) => (
-                    <Box key={item.id}>
-                      <Grid>
-                        <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                          <Text fz="md" fw={500}>{item.name}</Text>
-                        </GridCol>
-                        <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              <Box
+                p="md"
+                style={{
+                  border: '1px solid #e9ecef',
+                  borderRadius: '8px',
+                  height: '100%'
+                }}
+              >
+                <Stack gap="md">
+                  <Title order={3} fz={{ base: 18, md: 20 }} c={colors['blue-button']}>
+                    Pendapatan
+                  </Title>
+
+                  <Stack gap="sm">
+                    {latestApb?.pendapatan?.map((item) => (
+                      <Box key={item.id}>
+                        <Flex gap={1}>
                           <Text
-                            fz="md"
+                            fz={{ base: 13, md: 14 }}
                             fw={500}
-                            style={{
-                              wordBreak: 'break-word',
-                              whiteSpace: 'normal',
-                              textAlign: 'right',
-                            }}
+                            lh={1.4}
+                            c="black"
+                            style={{ wordBreak: 'break-word' }}
                           >
-                            {new Intl.NumberFormat('id-ID', { style: 'currency', currency: 'IDR', minimumFractionDigits: 0 }).format(item.value)}
+                            {item.name} {formatCurrency(item.value)}
                           </Text>
-                        </GridCol>
-                      </Grid>
-                    </Box>
-                  ))}
-                  <Grid>
-                    <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                      <Text fz="lg" fw={600} mb="xs">Total Pendapatan</Text>
-                    </GridCol>
-                    <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                      <Text style={{
-                        wordBreak: 'break-word',
-                        whiteSpace: 'normal'
-                      }} fz="xl" fw={700} c={colors['blue-button']}>
-                        {new Intl.NumberFormat('id-ID', {
-                          style: 'currency',
-                          currency: 'IDR',
-                          minimumFractionDigits: 0
-                        }).format(totalPendapatan)}
+                        </Flex>
+                      </Box>
+                    ))}
+                  </Stack>
+
+                  <Box
+                    pt="sm"
+                    mt="auto"
+                    style={{
+                      borderTop: `2px solid ${colors['blue-button']}`
+                    }}
+                  >
+                    <Flex direction="column" gap={4}>
+                      <Text fz={{ base: 14, md: 16 }} fw={600} lh={1.4}>
+                        Total Pendapatan
                       </Text>
-                    </GridCol>
-                  </Grid>
+                      <Text
+                        fz={{ base: 18, md: 22 }}
+                        fw={700}
+                        c={colors['blue-button']}
+                        lh={1.4}
+                      >
+                        {formatCurrency(totalPendapatan)}
+                      </Text>
+                    </Flex>
+                  </Box>
                 </Stack>
               </Box>
 
               {/* Belanja Card */}
-              <Box p="md" style={{ border: '1px solid #e9ecef', borderRadius: '8px' }}>
-                <Stack gap={"xs"}>
-                  <Title order={3}>Belanja</Title>
-                  {latestApb?.belanja?.map((item) => (
-                    <Box key={item.id}>
-                      <Grid>
-                        <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                          <Text fz="md" fw={500}>{item.name}</Text>
-                        </GridCol>
-                        <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                          <Text 
-                            fz="md" 
+              <Box
+                p="md"
+                style={{
+                  border: '1px solid #e9ecef',
+                  borderRadius: '8px',
+                  height: '100%'
+                }}
+              >
+                <Stack gap="md">
+                  <Title order={3} fz={{ base: 18, md: 20 }} c="orange">
+                    Belanja
+                  </Title>
+
+                  <Stack gap="sm">
+                    {latestApb?.belanja?.map((item) => (
+                      <Box key={item.id}>
+                        <Group gap={1}>
+                          <Text
+                            fz={{ base: 13, md: 14 }}
                             fw={500}
-                            style={{
-                              wordBreak: 'break-word',
-                              whiteSpace: 'normal',
-                              textAlign: 'right',
-                            }}
+                            lh={1.4}
+                            c="black"
+                            style={{ wordBreak: 'break-word' }}
                           >
-                            {new Intl.NumberFormat('id-ID', {
-                              style: 'currency',
-                              currency: 'IDR',
-                              minimumFractionDigits: 0
-                            }).format(item.value)}
+                            {item.name} {formatCurrency(item.value)}
                           </Text>
-                        </GridCol>
-                      </Grid>
-                    </Box>
-                  ))}
-                  <Grid>
-                    <GridCol span={{ base: 12, md: 6 }}>
-                      <Text fz="lg" fw={600} mb="xs">Total Belanja</Text>
-                    </GridCol>
-                    <GridCol span={{ base: 12, md: 6 }}>
-                      <Text fz="xl" fw={700} c="orange">
-                        {new Intl.NumberFormat('id-ID', {
-                          style: 'currency',
-                          currency: 'IDR',
-                          minimumFractionDigits: 0
-                        }).format(totalBelanja)}
+                        </Group>
+                      </Box>
+                    ))}
+                  </Stack>
+
+                  <Box
+                    pt="sm"
+                    mt="auto"
+                    style={{
+                      borderTop: '2px solid orange'
+                    }}
+                  >
+                    <Flex direction="column" gap={4}>
+                      <Text fz={{ base: 14, md: 16 }} fw={600} lh={1.4}>
+                        Total Belanja
                       </Text>
-                    </GridCol>
-                  </Grid>
+                      <Text
+                        fz={{ base: 18, md: 22 }}
+                        fw={700}
+                        c="orange"
+                        lh={1.4}
+                      >
+                        {formatCurrency(totalBelanja)}
+                      </Text>
+                    </Flex>
+                  </Box>
                 </Stack>
               </Box>
 
               {/* Pembiayaan Card */}
-              <Box p="md" style={{ border: '1px solid #e9ecef', borderRadius: '8px' }}>
-                <Stack gap={"xs"}>
-                  <Title order={3}>Pembiayaan</Title>
-                  {latestApb?.pembiayaan?.map((item) => (
-                    <Box key={item.id}>
-                      <Grid>
-                        <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                          <Text fz="md" fw={500}>{item.name}</Text>
-                        </GridCol>
-                        <GridCol span={{ base: 12, md: 6 }} style={{ maxWidth: '180px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                          <Text 
-                            fz="md" 
+              <Box
+                p="md"
+                style={{
+                  border: '1px solid #e9ecef',
+                  borderRadius: '8px',
+                  height: '100%'
+                }}
+              >
+                <Stack gap="md">
+                  <Title order={3} fz={{ base: 18, md: 20 }} c="green">
+                    Pembiayaan
+                  </Title>
+
+                  <Stack gap="sm">
+                    {latestApb?.pembiayaan?.map((item) => (
+                      <Box key={item.id}>
+                        <Group gap={1}>
+                          <Text
+                            fz={{ base: 13, md: 14 }}
                             fw={500}
-                            style={{
-                              wordBreak: 'break-word',
-                              whiteSpace: 'normal',
-                              textAlign: 'right',
-                            }}
+                            lh={1.4}
+                            c="black"
+                            style={{ wordBreak: 'break-word' }}
                           >
-                            {new Intl.NumberFormat('id-ID', {
-                              style: 'currency',
-                              currency: 'IDR',
-                              minimumFractionDigits: 0
-                            }).format(item.value)}
+                            {item.name} {formatCurrency(item.value)}
                           </Text>
-                        </GridCol>
-                      </Grid>
-                    </Box>
-                  ))}
-                  <Grid>
-                    <GridCol span={{ base: 12, md: 6 }}>
-                      <Text fz="lg" fw={600} mb="xs">Total Pembiayaan</Text>
-                    </GridCol>
-                    <GridCol span={{ base: 12, md: 6 }}>
-                      <Text fz="xl" fw={700} c="green">
-                        {new Intl.NumberFormat('id-ID', {
-                          style: 'currency',
-                          currency: 'IDR',
-                          minimumFractionDigits: 0
-                        }).format(totalPembiayaan)}
+                        </Group>
+                      </Box>
+                    ))}
+                  </Stack>
+
+                  <Box
+                    pt="sm"
+                    mt="auto"
+                    style={{
+                      borderTop: '2px solid green'
+                    }}
+                  >
+                    <Flex direction="column" gap={4}>
+                      <Text fz={{ base: 14, md: 16 }} fw={600} lh={1.4}>
+                        Total Pembiayaan
                       </Text>
-                    </GridCol>
-                  </Grid>
+                      <Text
+                        fz={{ base: 18, md: 22 }}
+                        fw={700}
+                        c="green"
+                        lh={1.4}
+                      >
+                        {formatCurrency(totalPembiayaan)}
+                      </Text>
+                    </Flex>
+                  </Box>
                 </Stack>
               </Box>
-
             </SimpleGrid>
           </Paper>
 
-          {/* 🔽 Tambahan Ringkasan Anggaran */}
-          <Paper bg={colors['white-1']} p="xl" shadow="sm" withBorder>
-            <Title order={3} mb="md">Ringkasan Anggaran</Title>
+          {/* Ringkasan Anggaran */}
+          <Paper bg={colors['white-1']} p={{ base: 'md', md: 'xl' }} shadow="sm" withBorder>
+            <Title order={3} mb="md" fz={{ base: 18, md: 20 }}>
+              Ringkasan Anggaran
+            </Title>
             <Table striped highlightOnHover withTableBorder>
               <Table.Thead>
                 <Table.Tr>
-                  <Table.Th>Keterangan</Table.Th>
-                  <Table.Th ta={"right"}>Jumlah</Table.Th>
+                  <Table.Th>
+                    <Text fz={{ base: 13, md: 14 }} fw={600}>Keterangan</Text>
+                  </Table.Th>
+                  <Table.Th ta="right">
+                    <Text fz={{ base: 13, md: 14 }} fw={600}>Jumlah</Text>
+                  </Table.Th>
                 </Table.Tr>
               </Table.Thead>
               <Table.Tbody>
                 <Table.Tr>
-                  <Table.Td>Total Pendapatan</Table.Td>
-                  <Table.Td align="right">
-                    {new Intl.NumberFormat('id-ID', { style: 'currency', currency: 'IDR', minimumFractionDigits: 0 }).format(totalPendapatan)}
+                  <Table.Td>
+                    <Text fz={{ base: 13, md: 14 }} lh={1.4}>Total Pendapatan</Text>
+                  </Table.Td>
+                  <Table.Td ta="right">
+                    <Text fz={{ base: 13, md: 14 }} fw={600} lh={1.4}>
+                      {formatCurrency(totalPendapatan)}
+                    </Text>
                   </Table.Td>
                 </Table.Tr>
                 <Table.Tr>
-                  <Table.Td>Total Belanja</Table.Td>
-                  <Table.Td align="right" c="orange">
-                    {new Intl.NumberFormat('id-ID', { style: 'currency', currency: 'IDR', minimumFractionDigits: 0 }).format(totalBelanja)}
+                  <Table.Td>
+                    <Text fz={{ base: 13, md: 14 }} lh={1.4} c="orange">Total Belanja</Text>
+                  </Table.Td>
+                  <Table.Td ta="right">
+                    <Text fz={{ base: 13, md: 14 }} fw={600} lh={1.4} c="orange">
+                      {formatCurrency(totalBelanja)}
+                    </Text>
                   </Table.Td>
                 </Table.Tr>
                 <Table.Tr>
-                  <Table.Td>Total Pembiayaan</Table.Td>
-                  <Table.Td align="right" c="green">
-                    {new Intl.NumberFormat('id-ID', { style: 'currency', currency: 'IDR', minimumFractionDigits: 0 }).format(totalPembiayaan)}
+                  <Table.Td>
+                    <Text fz={{ base: 13, md: 14 }} lh={1.4} c="green">Total Pembiayaan</Text>
+                  </Table.Td>
+                  <Table.Td ta="right">
+                    <Text fz={{ base: 13, md: 14 }} fw={600} lh={1.4} c="green">
+                      {formatCurrency(totalPembiayaan)}
+                    </Text>
                   </Table.Td>
                 </Table.Tr>
-                <Table.Tr>
-                  <Table.Td><b>Sisa Anggaran</b></Table.Td>
-                  <Table.Td align="right" c={sisaAnggaran >= 0 ? "blue" : "red"}>
-                    <b>
-                      {new Intl.NumberFormat('id-ID', { style: 'currency', currency: 'IDR', minimumFractionDigits: 0 }).format(sisaAnggaran)}
-                    </b>
+                <Table.Tr style={{ backgroundColor: '#f8f9fa' }}>
+                  <Table.Td>
+                    <Text fz={{ base: 14, md: 15 }} fw={700} lh={1.4}>Sisa Anggaran</Text>
+                  </Table.Td>
+                  <Table.Td ta="right">
+                    <Text
+                      fz={{ base: 14, md: 15 }}
+                      fw={700}
+                      c={sisaAnggaran >= 0 ? colors['blue-button'] : "red"}
+                      lh={1.4}
+                    >
+                      {formatCurrency(sisaAnggaran)}
+                    </Text>
                   </Table.Td>
                 </Table.Tr>
               </Table.Tbody>
diff --git a/src/app/darmasaba/(pages)/ekonomi/pasar-desa/page.tsx b/src/app/darmasaba/(pages)/ekonomi/pasar-desa/page.tsx
index 41d388d0..6f08a347 100644
--- a/src/app/darmasaba/(pages)/ekonomi/pasar-desa/page.tsx
+++ b/src/app/darmasaba/(pages)/ekonomi/pasar-desa/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import pasarDesaState from '@/app/admin/(dashboard)/_state/ekonomi/pasar-desa/pasar-desa';
 import colors from '@/con/colors';
-import { Box, Center, Flex, Grid, GridCol, Image, Pagination, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { Box, Center, Flex, Grid, GridCol, Image, Pagination, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
 import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { IconBrandWhatsapp, IconMapPinFilled, IconSearch, IconStarFilled } from '@tabler/icons-react';
 import { motion } from 'motion/react';
@@ -14,7 +14,7 @@ function Page() {
   const router = useRouter()
   const state = useProxy(pasarDesaState.pasarDesa)
   const [search, setSearch] = useState('');
-  const [debouncedSearch] = useDebouncedValue(search, 1000); // 500ms delay
+  const [debouncedSearch] = useDebouncedValue(search, 1000);
   const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
   const {
     data,
@@ -28,7 +28,6 @@ function Page() {
     pasarDesaState.kategoriProduk.findManyAll.load()
   }, [])
 
-  // Filter data based on selected category
   const filteredData = selectedCategory
     ? data?.filter(item =>
       item.KategoriToPasar?.some(kategori => kategori.kategoriId === selectedCategory)
@@ -39,7 +38,6 @@ function Page() {
     load(page, 4, debouncedSearch, selectedCategory || undefined)
   }, [page, debouncedSearch, selectedCategory])
 
-
   if (loading || !data) {
     return (
       <Stack py={10}>
@@ -49,21 +47,22 @@ function Page() {
   }
 
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
+
       <Box>
-        <Grid align='center' px={{ base: 'md', md: 100 }}>
+        <Grid align="center" px={{ base: 'md', md: 100 }}>
           <GridCol span={{ base: 12, md: 9 }}>
-            <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+            <Title order={1} c={colors["blue-button"]} fw="bold">
               Pasar Desa
-            </Text>
+            </Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 3 }}>
             <TextInput
-              radius={"lg"}
-              placeholder='Cari Produk'
+              radius="lg"
+              placeholder="Cari Produk"
               value={search}
               onChange={(e) => setSearch(e.target.value)}
               leftSection={<IconSearch size={20} />}
@@ -71,22 +70,15 @@ function Page() {
             />
           </GridCol>
         </Grid>
-        <Text px={{ base: 'md', md: 100 }} ta={"justify"} fz="md" >
-        Pasar Desa Online adalah media promosi untuk membantu warga memasarkan
-        </Text>
-        <Text px={{ base: 'md', md: 100 }} ta={"justify"} fz="md" >
-        dan memperkenalkan produk mereka.
+
+        <Text px={{ base: 'md', md: 100 }} pt={20} ta="justify" fz={{ base: 'sm', md: 'md' }}>
+          Pasar Desa Online adalah media promosi untuk membantu warga memasarkan dan memperkenalkan produk mereka.
         </Text>
       </Box>
+
       <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <SimpleGrid
-            pb={30}
-            cols={{
-              base: 1,
-              md: 2
-            }}
-          >
+        <Stack gap="lg">
+          <SimpleGrid pb={30} cols={{ base: 1, md: 2 }}>
             <Box>
               <Select
                 placeholder="Pilih Kategori"
@@ -103,50 +95,58 @@ function Page() {
               />
             </Box>
           </SimpleGrid>
+
           <SimpleGrid cols={{ base: 1, md: 4 }}>
-            {filteredData?.map((v, k) => {
-              return (
-                <Stack key={k}>
-                  <motion.div
-                    onClick={() => router.push(`/darmasaba/ekonomi/pasar-desa/${v.id}`)}
-                    whileHover={{ scale: 1.05 }}
-                    whileTap={{ scale: 0.8 }}
-                  >
-                    <Paper p={'lg'}>
-                      <Image
-                        radius={'lg'}
-                        src={v.image?.link || '/placeholder-product.jpg'}
-                        alt={v.nama}
-                        h={200}
-                        w='100%'
-                        style={{ objectFit: 'cover' }}
-                        loading="lazy" 
-                      />
-                      <Text py={10} fw={'bold'} fz={'lg'}>{v.nama}</Text>
-                      <Text fz={'md'}>Rp {v.harga.toLocaleString('id-ID')}</Text>
-                      <Flex py={10} gap={'md'}>
-                        <IconStarFilled size={20} color='#EBCB09' />
-                        <Text fz={'sm'} ml={2}>{v.rating}</Text>
-                      </Flex>
-                      <Flex justify={'space-between'} align={'center'}>
-                        <Box>
-                          <Flex gap={'md'} align={'center'}>
-                            <IconMapPinFilled size={20} color='red' />
-                            <Text fz={'sm'} ml={2}>{v.alamatUsaha}</Text>
-                          </Flex>
-                        </Box>
-                        <IconBrandWhatsapp size={20} color={colors['blue-button']} />
-                      </Flex>
-                    </Paper>
-                  </motion.div>
-                </Stack>
-              )
-            })}
+            {filteredData?.map((v, k) => (
+              <Stack key={k}>
+                <motion.div
+                  onClick={() => router.push(`/darmasaba/ekonomi/pasar-desa/${v.id}`)}
+                  whileHover={{ scale: 1.05 }}
+                  whileTap={{ scale: 0.8 }}
+                >
+                  <Paper p="lg">
+                    <Image
+                      radius="lg"
+                      src={v.image?.link || '/placeholder-product.jpg'}
+                      alt={v.nama}
+                      h={200}
+                      w="100%"
+                      style={{ objectFit: 'cover' }}
+                      loading="lazy"
+                    />
+                    <Text py="sm" fw="bold" fz={{ base: 'md', md: 'lg' }}>
+                      {v.nama}
+                    </Text>
+                    <Text fz={{ base: 'sm', md: 'md' }}>
+                      Rp {v.harga.toLocaleString('id-ID')}
+                    </Text>
+                    <Flex py="sm" gap="md">
+                      <IconStarFilled size={20} color="#EBCB09" />
+                      <Text fz={{ base: 'xs', md: 'sm' }} ml={2}>
+                        {v.rating}
+                      </Text>
+                    </Flex>
+                    <Flex justify="space-between" align="center">
+                      <Box>
+                        <Flex gap="md" align="center">
+                          <IconMapPinFilled size={20} color="red" />
+                          <Text fz={{ base: 'xs', md: 'sm' }} ml={2}>
+                            {v.alamatUsaha}
+                          </Text>
+                        </Flex>
+                      </Box>
+                      <IconBrandWhatsapp size={20} color={colors['blue-button']} />
+                    </Flex>
+                  </Paper>
+                </motion.div>
+              </Stack>
+            ))}
           </SimpleGrid>
+
           <Center>
             <Pagination
               value={page}
-              onChange={(newPage) => load(newPage)} // ini penting!
+              onChange={(newPage) => load(newPage)}
               total={totalPages}
               my="md"
             />
@@ -157,4 +157,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/ekonomi/program-kemiskinan/page.tsx b/src/app/darmasaba/(pages)/ekonomi/program-kemiskinan/page.tsx
index f7a91480..03d578ba 100644
--- a/src/app/darmasaba/(pages)/ekonomi/program-kemiskinan/page.tsx
+++ b/src/app/darmasaba/(pages)/ekonomi/program-kemiskinan/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import programKemiskinanState from '@/app/admin/(dashboard)/_state/ekonomi/program-kemiskinan';
 import colors from '@/con/colors';
-import { Box, Center, Grid, GridCol, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { Box, Center, Grid, GridCol, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
 import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { IconSearch } from '@tabler/icons-react';
 import { useState } from 'react';
@@ -32,10 +32,9 @@ interface ProgramKemiskinanData {
 
 function Page() {
   const [search, setSearch] = useState('')
-  const [debouncedSearch] = useDebouncedValue(search, 1000); // 500ms delay
+  const [debouncedSearch] = useDebouncedValue(search, 1000);
   const state = useProxy(programKemiskinanState)
 
-  // 🔧 Get valid statistics data with proper type checking
   const statistikData = state.findMany.data
     .filter((item): item is ProgramKemiskinanData & { statistik: StatistikData } => {
       return !!item?.statistik && 
@@ -43,11 +42,11 @@ function Page() {
              item.statistik.jumlah !== undefined;
     })
     .map(item => ({
-      tahun: Number(item.statistik.tahun) || 0, // Ensure tahun is a number
-      jumlah: Number(item.statistik.jumlah) || 0, // Ensure jumlah is a number
+      tahun: Number(item.statistik.tahun) || 0,
+      jumlah: Number(item.statistik.jumlah) || 0,
     }))
     .sort((a, b) => a.tahun - b.tahun)
-    .filter(item => !isNaN(item.tahun) && !isNaN(item.jumlah)); // Remove any invalid entries
+    .filter(item => !isNaN(item.tahun) && !isNaN(item.jumlah));
 
   const {
     data,
@@ -74,12 +73,18 @@ function Page() {
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Box px={{ base: 'md', md: 100 }} >
+      <Box px={{ base: 'md', md: 100 }}>
         <Grid align='center'>
           <GridCol span={{ base: 12, md: 9 }}>
-            <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+            <Title
+              order={1}
+              c={colors["blue-button"]}
+              fw={"bold"}
+              fz={{ base: '28px', md: '32px' }}
+              lh={{ base: '1.2', md: '1.25' }}
+            >
               Program Kemiskinan
-            </Text>
+            </Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 3 }}>
             <TextInput
@@ -92,7 +97,15 @@ function Page() {
             />
           </GridCol>
         </Grid>
-        <Text fz={'h4'}>Berbagai program bantuan untuk mengurangi kemiskinan dan meningkatkan kesejahteraan masyarakat</Text>
+        <Text
+          fz={{ base: '14px', md: '16px' }}
+          lh={{ base: '1.5', md: '1.6' }}
+          c="black"
+          ta={{ base: 'left', md: 'left' }}
+          pt={20}
+        >
+          Berbagai program bantuan untuk mengurangi kemiskinan dan meningkatkan kesejahteraan masyarakat
+        </Text>
       </Box>
       <Box px={{ base: "md", md: 100 }}>
         <Stack gap={'lg'} justify='center'>
@@ -106,8 +119,22 @@ function Page() {
             {state.findMany.data.map(v => {
               return (
                 <Paper p={'xl'} key={v.id}>
-                  <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.nama}</Text>
-                  <Text fz={'lg'} c={'black'} style={{wordBreak: "break-word", whiteSpace: "normal"}} dangerouslySetInnerHTML={{ __html: v.deskripsi }}></Text>
+                  <Title
+                    order={3}
+                    fw={'bold'}
+                    c={colors['blue-button']}
+                    fz={{ base: '18px', md: '20px' }}
+                    lh={{ base: '1.3', md: '1.35' }}
+                  >
+                    {v.nama}
+                  </Title>
+                  <Text
+                    fz={{ base: '14px', md: '16px' }}
+                    lh={{ base: '1.5', md: '1.6' }}
+                    c={'black'}
+                    style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                    dangerouslySetInnerHTML={{ __html: v.deskripsi }}
+                  />
                 </Paper>
               )
             })}
@@ -124,7 +151,16 @@ function Page() {
             />
           </Center>
           <Paper p={'xl'}>
-            <Text fz={'h3'} fw={'bold'} c={colors['blue-button']} mb="md">Statistik Kemiskinan Masyarakat</Text>
+            <Title
+              order={3}
+              fw={'bold'}
+              c={colors['blue-button']}
+              fz={{ base: '18px', md: '20px' }}
+              lh={{ base: '1.3', md: '1.35' }}
+              mb="md"
+            >
+              Statistik Kemiskinan Masyarakat
+            </Title>
             <Box style={{ width: '100%', height: 'auto' }}>
               {statistikData.length > 0 ? (
                 <Box w="100%" style={{ overflowX: 'auto' }}>
@@ -162,7 +198,11 @@ function Page() {
                 </Box>
               ) : (
                 <Box p="md" ta="center" bg="gray.0" style={{ borderRadius: '8px' }}>
-                  <Text c="dimmed">
+                  <Text
+                    fz={{ base: '12px', md: '14px' }}
+                    c="dimmed"
+                    lh={{ base: '1.4', md: '1.5' }}
+                  >
                     {state.findMany.loading 
                       ? 'Memuat data statistik...' 
                       : 'Belum ada data statistik yang tersedia atau data tidak valid'}
@@ -177,4 +217,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/page.tsx b/src/app/darmasaba/(pages)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/page.tsx
index 9943e1d5..446bc801 100644
--- a/src/app/darmasaba/(pages)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/page.tsx
+++ b/src/app/darmasaba/(pages)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/page.tsx
@@ -14,6 +14,9 @@ import {
   Loader,
   Paper,
   Stack,
+  Tabs,
+  TabsList,
+  TabsTab,
   Text,
   TextInput,
   Title,
@@ -33,6 +36,8 @@ import { OrganizationChart } from 'primereact/organizationchart'
 import { useEffect, useRef, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import BackButton from '../../desa/layanan/_com/BackButto'
+import { useMediaQuery } from '@mantine/hooks'
+import { useTransitionRouter } from 'next-view-transitions'
 
 export default function Page() {
   return (
@@ -51,11 +56,11 @@ export default function Page() {
             order={1}
             ta="center"
             c={colors['blue-button']}
-            fz={{ base: 28, md: 36, lg: 44 }}
+            fz={{ base: 28, md: 36 }}
           >
             Struktur Organisasi & SK Pengurus BumDes
           </Title>
-          <Text ta="center" c="black" maw={800}>
+          <Text ta="center" c="black" maw={800} fz={{ base: 14, md: 16 }} lh={1.6}>
             Gambaran visual peran dan pengurus yang ditugaskan. Gunakan kontrol
             di bawah untuk mencari, memperbesar, atau melihat lebih jelas.
           </Text>
@@ -70,13 +75,14 @@ export default function Page() {
 }
 
 function StrukturOrganisasiBumDes() {
+  const router = useTransitionRouter()
   const stateOrganisasi: any = useProxy(stateStrukturBumDes.pegawai)
   const chartContainerRef = useRef<HTMLDivElement>(null)
   const [scale, setScale] = useState(1)
   const [isFullscreen, setFullscreen] = useState(false)
   const [searchQuery, setSearchQuery] = useState('')
   const debouncedSearch = useRef(
-    debounce((value: string) => setSearchQuery(value), 400)
+    debounce((value: string) => setSearchQuery(value), 1000)
   ).current
 
   useEffect(() => {
@@ -92,8 +98,10 @@ function StrukturOrganisasiBumDes() {
       <Center py={48}>
         <Stack align="center" gap="sm">
           <Loader size="lg" />
-          <Text fw={600}>Memuat struktur organisasi…</Text>
-          <Text c="dimmed" size="sm">
+          <Text fw={600} fz={{ base: 15, md: 16 }} lh={1.4}>
+            Memuat struktur organisasi…
+          </Text>
+          <Text c="dimmed" fz={{ base: 12, md: 14 }} lh={1.4}>
             Mengambil data pengurus dan posisi. Mohon tunggu sebentar.
           </Text>
         </Stack>
@@ -119,10 +127,10 @@ function StrukturOrganisasiBumDes() {
             <Center>
               <IconUsers size={56} />
             </Center>
-            <Title order={3} mt="md">
+            <Title order={3} mt="md" ta="center">
               Data pengurus belum tersedia
             </Title>
-            <Text c="dimmed" mt="xs">
+            <Text c="dimmed" mt="xs" fz={{ base: 12, md: 14 }} lh={1.4}>
               Belum ada data pengurus yang tercatat untuk BumDes.
             </Text>
             <Group justify="center" mt="lg">
@@ -218,155 +226,300 @@ function StrukturOrganisasiBumDes() {
   return (
     <Stack align="center" mt="xl">
       {/* 🧭 Kontrol atas */}
-      <Paper shadow="xs" p="md" radius="md" bg={colors['blue-button']}>
-        <Group gap="sm" wrap="wrap" justify="center">
-          <TextInput
-            placeholder="Cari nama atau jabatan..."
-            leftSection={<IconSearch size={16} />}
-            onChange={(e) => debouncedSearch(e.target.value)}
+      <Paper
+        shadow="xs"
+        w={{
+          base: '100%',       // Mobile: 100%
+          sm: '40%',          // Tablet: 95%
+          md: '39%',          // Desktop: 70%
+          lg: '38%',          // Desktop L: 60%
+          xl: '37%',          // 4K: 50%
+          '2xl': '36%',       // Ultra-wide: 45%
+        }}
+        p="md"
+        radius="md"
+        style={{
+          background: colors['blue-button'],       // ⬅️ penting
+          maxWidth: '100%',    // ⬅️ penting
+          overflowX: 'auto'    // ⬅️ untuk mencegah overflow
+        }}
+      >
+        <Stack gap="sm">
+          <Group justify='center'>
+            <TextInput
+              placeholder="Cari nama atau jabatan..."
+              leftSection={<IconSearch size={16} />}
+              onChange={(e) => debouncedSearch(e.target.value)}
+              styles={{
+                input: {
+                  minWidth: 250,
+                },
+              }}
+            />
+          </Group>
+          <Tabs
+            defaultValue="zoom-out"
+            variant="outline"
+            radius="md"
             styles={{
-              input: {
-                minWidth: 250,
+              panel: { display: 'none' },
+              tab: {
+                color: colors['blue-button'],
+                backgroundColor: colors['blue-button-2'],
+                border: 'none',
+                fontWeight: 600,
+                fontSize: '0.875rem',
+                padding: '6px 12px',
+                minHeight: 'auto',
+                flexShrink: 0,
               },
             }}
-          />
-          <Group gap="xs">
-            <Button
-              variant="light"
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              size="sm"
-              onClick={handleZoomOut}
-              leftSection={<IconZoomOut size={16} />}
-            >
-              Zoom Out
-            </Button>
-            <Box
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              px={16}
-              py={8}
+            style={{ width: '100%' }} // 👈 penting
+          >
+            <TabsList
               style={{
-                fontSize: 14,
-                fontWeight: 700,
-                borderRadius: '8px',
-                minWidth: 70,
-                textAlign: 'center',
+                display: 'flex',
+                overflowX: 'auto',
+                overflowY: 'hidden',
+                gap: '4px',
+                paddingBottom: '4px',
+                flexWrap: 'nowrap',
+                WebkitOverflowScrolling: 'touch',
+                scrollbarWidth: 'thin',
+                msOverflowStyle: '-ms-autohiding-scrollbar',
+                maxWidth: '100%',
+                scrollBehavior: 'smooth', // 👈 smooth scroll
               }}
             >
-              {Math.round(scale * 100)}%
-            </Box>
-            <Button
-              variant="light"
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              size="sm"
-              onClick={handleZoomIn}
-              leftSection={<IconZoomIn size={16} />}
-            >
-              Zoom In
-            </Button>
-            <Button
-              variant="light"
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              size="sm"
-              onClick={resetZoom}
-            >
-              Reset
-            </Button>
-            <Button
-              variant="light"
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              size="sm"
-              onClick={toggleFullscreen}
-              leftSection={
-                isFullscreen ? (
-                  <IconArrowsMinimize size={16} />
-                ) : (
-                  <IconArrowsMaximize size={16} />
-                )
-              }
-            >
-              Fullscreen
-            </Button>
-          </Group>
-        </Group>
+              <TabsTab
+                value="zoom-out"
+                onClick={handleZoomOut}
+                leftSection={<IconZoomOut size={16} />}
+                style={{ flexShrink: 0 }}
+              >
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">Zoom Out</Text>
+              </TabsTab>
+
+              <Box
+                bg={colors['blue-button-2']}
+                c={colors['blue-button']}
+                px={12}
+                py={6}
+                style={{
+                  fontWeight: 700,
+                  borderRadius: '6px',
+                  minWidth: 60,
+                  textAlign: 'center',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  flexShrink: 0,
+                  whiteSpace: 'nowrap',
+                }}
+              >
+                <Text fz={{ base: 12, sm: 13 }} lh={1} c={colors['blue-button']}>
+                  {Math.round(scale * 100)}%
+                </Text>
+              </Box>
+
+              <TabsTab
+                value="zoom-in"
+                onClick={handleZoomIn}
+                leftSection={<IconZoomIn size={16} />}
+                style={{ flexShrink: 0 }}
+              >
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">Zoom In</Text>
+              </TabsTab>
+
+              <TabsTab
+                value="reset"
+                onClick={resetZoom}
+                style={{ flexShrink: 0 }}
+              >
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">Reset</Text>
+              </TabsTab>
+
+              <TabsTab
+                value="fullscreen"
+                onClick={toggleFullscreen}
+                leftSection={
+                  isFullscreen ? (
+                    <IconArrowsMinimize size={16} />
+                  ) : (
+                    <IconArrowsMaximize size={16} />
+                  )
+                }
+                style={{ flexShrink: 0 }}
+              >
+                <Text fz={{ base: 12, sm: 13 }} lh={1} ta="center">
+                  {isFullscreen ? 'Exit' : 'Fullscreen'}
+                </Text>
+              </TabsTab>
+            </TabsList>
+          </Tabs>
+        </Stack>
       </Paper>
 
-      {/* 📊 Chart Container */}
-      <Center style={{ width: '100%' }}>
-        <Box
-          ref={chartContainerRef}
-          style={{
-            overflowX: 'auto',
-            overflowY: 'auto',
-            width: '100%',
-            padding: '32px 16px',
-            transition: 'transform 0.2s ease',
-            transform: `scale(${scale})`,
-            transformOrigin: 'center top',
-          }}
-        >
-          <OrganizationChart
-            value={chartData}
-            nodeTemplate={(node) => <NodeCard node={node} />}
-            className="p-organizationchart p-organizationchart-horizontal"
-          />
-        </Box>
-      </Center>
-    </Stack>
-  )
-}
-
-function NodeCard({ node }: any) {
-  const imageSrc = node?.data?.image || '/img/default.png'
-  const name = node?.data?.name || 'Tanpa Nama'
-  const title = node?.data?.title || 'Tanpa Jabatan'
-  const description = node?.data?.description || ''
-
-  return (
-    <Transition mounted transition="pop" duration={300}>
-      {(styles) => (
-        <Card
-          shadow="md"
-          radius="xl"
-          withBorder
-          style={{
-            ...styles,
-            width: 240,
-            padding: 20,
-            background:
-              'linear-gradient(135deg, rgba(28,110,164,0.15) 0%, rgba(255,255,255,0.95) 100%)',
-            borderColor: 'rgba(28, 110, 164, 0.3)',
-            transition: 'all 0.3s ease',
-          }}
-        >
-          <Stack align="center" gap={10}>
-            <Box
-              style={{
-                width: 90,
-                height: 90,
-                borderRadius: '50%',
-                overflow: 'hidden',
-                border: '3px solid rgba(28, 110, 164, 0.4)',
-              }}
-            >
-              <Image src={imageSrc} alt={name} fit="cover" loading="lazy" />
-            </Box>
-            <Text fw={700} size="sm" ta="center" c={colors['blue-button']}>
-              {name}
-            </Text>
-            <Text size="xs" c="dimmed" ta="center">
-              {title}
-            </Text>
-            <Text size="xs" c="dimmed" ta="center" lineClamp={3}>
-              {description || 'Belum ada deskripsi.'}
-            </Text>
+       {/* 🧩 Chart Container */}
+            <Center style={{ width: '100%' }}>
+              <Box
+                ref={chartContainerRef}
+                style={{
+                  borderRadius: '12px',
+                  overflowX: 'auto',
+                  overflowY: 'auto',
+                  width: '100%',
+                  maxWidth: '100%',
+                  padding: '32px 16px',
+                  transition: 'transform 0.2s ease',
+                }}
+              >
+                <Box style={{
+                  
+                  transform: `scale(${scale})`,
+                  transformOrigin: 'center top',
+                  display: 'inline-block', // 👈 agar tidak memenuhi lebar parent
+                  minWidth: 'min-content', // 👈 penting agar chart tidak dipaksa muat di width 100%
+                }}>
+                  <OrganizationChart
+                    value={chartData}
+                    nodeTemplate={(node) => <NodeCard node={node} router={router} />}
+                    className="p-organizationchart p-organizationchart-horizontal"
+                  />
+                </Box>
+              </Box>
+            </Center>
           </Stack>
-        </Card>
-      )}
-    </Transition>
-  )
-}
+        )
+      }
+      
+      function NodeCard({ node, router }: any) {
+        const imageSrc = node?.data?.image || '/img/default.png'
+        const name = node?.data?.name || 'Tanpa Nama'
+        const title = node?.data?.title || 'Tanpa Jabatan'
+        const hasId = Boolean(node?.data?.id)
+        const isMobile = useMediaQuery("(max-width: 768px)");
+      
+        return (
+          <Transition mounted transition="pop" duration={300}>
+            {(styles) => (
+              <Card
+                shadow="md"
+                radius="xl"
+                withBorder
+              
+                style={{
+                  ...styles,
+                  width: '100%',
+                  maxWidth: isMobile ? 200 : 240, // lebih kecil di mobile
+                  minHeight: isMobile ? 240 : 280,
+                  padding: isMobile ? 16 : 20,
+                  background: 'linear-gradient(135deg, rgba(28,110,164,0.15) 0%, rgba(255,255,255,0.95) 100%)',
+                  borderColor: 'rgba(28, 110, 164, 0.3)',
+                  borderWidth: 2,
+                  transition: 'all 0.3s ease',
+                  cursor: hasId ? 'pointer' : 'default',
+                }}
+                onMouseEnter={(e) => {
+                  if (hasId) {
+                    e.currentTarget.style.transform = 'translateY(-4px)'
+                    e.currentTarget.style.boxShadow = '0 8px 24px rgba(28, 110, 164, 0.25)'
+                  }
+                }}
+                onMouseLeave={(e) => {
+                  if (hasId) {
+                    e.currentTarget.style.transform = 'translateY(0)'
+                    e.currentTarget.style.boxShadow = ''
+                  }
+                }}
+              >
+                <Stack align="center" gap={12}>
+                  {/* Photo */}
+                  <Box
+                    style={{
+                      width: 96,
+                      height: 96,
+                      borderRadius: '50%',
+                      overflow: 'hidden',
+                      border: '3px solid rgba(28, 110, 164, 0.4)',
+                      boxShadow: '0 4px 12px rgba(0, 0, 0, 0.1)',
+                      background: 'white',
+                    }}
+                  >
+                    <Image
+                      src={imageSrc}
+                      alt={name}
+                      width={96}
+                      height={96}
+                      fit="cover"
+                      loading="lazy"
+                      style={{
+                        objectFit: 'cover',
+                      }}
+                    />
+                  </Box>
+      
+                  {/* Name */}
+                  <Text
+                    fw={700}
+                    ta="center"
+                    c={colors['blue-button']}
+                    lineClamp={2}
+                    fz={{ base: 13, md: 15 }}
+                    lh={1.2}
+                    style={{
+                      minHeight: 40,
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                      wordBreak: 'break-word',
+                    }}
+                  >
+                    {name}
+                  </Text>
+      
+                  {/* Title/Position */}
+                  <Text
+                    c="dimmed"
+                    ta="center"
+                    fw={500}
+                    lineClamp={2}
+                    fz={{ base: 12, md: 13 }}
+                    lh={1.3}
+                    style={{
+                      minHeight: 32,
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                      wordBreak: 'break-word',
+                    }}
+                  >
+                    {title}
+                  </Text>
+      
+                  {/* Detail Button */}
+                  {hasId && (
+                    <Button
+                      variant="gradient"
+                      gradient={{ from: 'blue', to: 'cyan' }}
+                      size="xs"
+                      fullWidth
+                      mt={8}
+                      radius="md"
+                      onClick={() =>
+                        router.push(`/darmasaba/ppid/struktur-ppid/${node.data.id}`)
+                      }
+                      style={{
+                        height: 32,
+                        fontWeight: 600,
+                      }}
+                    >
+                      <Text fz={{ base: 12, md: 13 }} lh={1} ta="center">Lihat Detail</Text>
+                    </Button>
+                  )}
+                </Stack>
+              </Card>
+            )}
+          </Transition>
+        )
+      }
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/keamanan/keamanan-lingkungan-pecalang-patwal/page.tsx b/src/app/darmasaba/(pages)/keamanan/keamanan-lingkungan-pecalang-patwal/page.tsx
index 1bc6146f..7761bb69 100644
--- a/src/app/darmasaba/(pages)/keamanan/keamanan-lingkungan-pecalang-patwal/page.tsx
+++ b/src/app/darmasaba/(pages)/keamanan/keamanan-lingkungan-pecalang-patwal/page.tsx
@@ -58,7 +58,7 @@ function Page() {
             />
           </GridCol>
         </Grid>
-        <Text px={{ base: 'md', md: 100 }} ta={"justify"} fz="md" mt={4} >
+        <Text px={{ base: 'md', md: 100 }} pt={20} ta={"justify"} fz="md" mt={4} >
           Pecalang dan Patwal (Patroli Pengawal) bertugas memastikan desa tetap aman, tertib, dan kondusif bagi seluruh warga.
         </Text>
       </Box>
diff --git a/src/app/darmasaba/(pages)/keamanan/laporan-publik/[id]/page.tsx b/src/app/darmasaba/(pages)/keamanan/laporan-publik/[id]/page.tsx
index fbf8a42d..921c5e8c 100644
--- a/src/app/darmasaba/(pages)/keamanan/laporan-publik/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/keamanan/laporan-publik/[id]/page.tsx
@@ -71,14 +71,14 @@ function Page() {
             <Stack gap="md">
               <Box>
                 <Text fw={600} fz="lg" >Judul</Text>
-                <Text fz="sm" c="dimmed">{data.judul || '-'}</Text>
+                <Text fz="sm" c="black">{data.judul || '-'}</Text>
               </Box>
 
               <Divider />
 
               <Box>
                 <Text fw={600} fz="lg" >Tanggal</Text>
-                <Text fz="sm" c="dimmed">
+                <Text fz="sm" c="black">
                   {data.tanggalWaktu
                     ? new Date(data.tanggalWaktu).toLocaleString('id-ID', { dateStyle: 'full', timeStyle: 'short' })
                     : '-'}
@@ -89,7 +89,7 @@ function Page() {
 
               <Box>
                 <Text fw={600} fz="lg" >Lokasi</Text>
-                <Text fz="sm" c="dimmed">{data.lokasi || '-'}</Text>
+                <Text fz="sm" c="black">{data.lokasi || '-'}</Text>
               </Box>
 
               <Divider />
@@ -120,7 +120,7 @@ function Page() {
 
               <Box>
                 <Text fw={600} fz="lg" >Kronologi</Text>
-                <Text fz="sm" c="dimmed" style={{wordBreak: "break-word", whiteSpace: "normal"}} dangerouslySetInnerHTML={{ __html: data.kronologi || '-' }} />
+                <Text fz="sm" c="black" style={{wordBreak: "break-word", whiteSpace: "normal"}} dangerouslySetInnerHTML={{ __html: data.kronologi || '-' }} />
               </Box>
 
               <Divider />
@@ -136,11 +136,11 @@ function Page() {
                         radius="md"
                         shadow="xs"
                         withBorder
-                        bg="dark.5"
+                        bg={colors['blue-button-1']}
                       >
                         <Text
                           fz="sm"
-                          c="dimmed"
+                          c="black"
                           dangerouslySetInnerHTML={{ __html: item.deskripsi || '-' }}
                           style={{wordBreak: "break-word", whiteSpace: "normal"}}
                         />
diff --git a/src/app/darmasaba/(pages)/keamanan/tips-keamanan/page.tsx b/src/app/darmasaba/(pages)/keamanan/tips-keamanan/page.tsx
index 052a3de7..5ef575b3 100644
--- a/src/app/darmasaba/(pages)/keamanan/tips-keamanan/page.tsx
+++ b/src/app/darmasaba/(pages)/keamanan/tips-keamanan/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
 import BackButton from '../../desa/layanan/_com/BackButto';
 import { useProxy } from 'valtio/utils';
 import tipsKeamananState from '@/app/admin/(dashboard)/_state/keamanan/tips-keamanan';
@@ -8,11 +8,10 @@ import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { useState } from 'react';
 import { IconSearch } from '@tabler/icons-react';
 
-
 function Page() {
-  const state = useProxy(tipsKeamananState)
-  const [search, setSearch] = useState('')
-  const [debouncedSearch] = useDebouncedValue(search, 1000); // 500ms delay
+  const state = useProxy(tipsKeamananState);
+  const [search, setSearch] = useState('');
+  const [debouncedSearch] = useDebouncedValue(search, 1000);
   const {
     data,
     page,
@@ -22,84 +21,114 @@ function Page() {
   } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, debouncedSearch)
-  }, [page, debouncedSearch])
+    load(page, 3, debouncedSearch);
+  }, [page, debouncedSearch]);
 
   if (loading || !data) {
     return (
-      <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+      <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
         <Skeleton h={500} />
       </Stack>
-    )
+    );
   }
 
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
+
       <Box>
-        <Grid align='center' px={{ base: 'md', md: 100 }}>
+        <Grid align="center" px={{ base: 'md', md: 100 }}>
           <GridCol span={{ base: 12, md: 9 }}>
-            <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+            <Title
+              order={1}
+              c={colors['blue-button']}
+              style={{ lineHeight: '1.2' }}
+            >
               Tips Keamanan
-            </Text>
+            </Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 3 }}>
             <TextInput
-              radius={"lg"}
-              placeholder='Cari Tips'
+              radius="lg"
+              placeholder="Cari Tips"
               value={search}
               onChange={(e) => setSearch(e.target.value)}
               leftSection={<IconSearch size={20} />}
-              w={{ base: "50%", md: "100%" }}
+              w={{ base: '50%', md: '100%' }}
             />
           </GridCol>
         </Grid>
-        <Text px={{ base: 'md', md: 100 }} ta={"justify"} fz="md" >
+
+        <Text
+          px={{ base: 'md', md: 100 }}
+          ta="justify"
+          fz={{ base: 'sm', md: 'md' }}
+          lh={{ base: '1.5', md: '1.6' }}
+          mt="sm"
+        >
           Keamanan dan ketertiban lingkungan di Desa Darmasaba dijaga melalui peran aktif Pecalang dan Patwal (Patroli Pengawal).
         </Text>
-        <Text px={{ base: 'md', md: 100 }} ta={"justify"} fz="md" >
+        <Text
+          px={{ base: 'md', md: 100 }}
+          ta="justify"
+          fz={{ base: 'sm', md: 'md' }}
+          lh={{ base: '1.5', md: '1.6' }}
+          mt="xs"
+        >
           Mereka bertugas memastikan desa tetap aman, tertib, dan kondusif bagi seluruh warga.
         </Text>
       </Box>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
+
+      <Box px={{ base: 'md', md: 100 }}>
+        <Stack gap="lg">
           <SimpleGrid
-            pb={10}
-            cols={{
-              base: 1,
-              md: 3,
-            }}>
-            {data.map((v, k) => {
-              return (
-                <Paper radius={10} key={k} bg={colors["white-trans-1"]}>
-                  <Stack gap={'xs'}>
-                    <Center p={10}>
-                      <Image src={v.image?.link} radius={10} loading="lazy"
-                        alt='' />
-                    </Center>
-                    <Box px={'xl'}>
-                      <Box pb={20}>
-                        <Text pb={10} c={colors["blue-button"]} fw={"bold"} fz={"h3"}>
-                          {v.judul}
-                        </Text>
-                        <Box>
-                          <Text pb={10} fz={"md"} style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
-                        </Box>
+            pb="10"
+            cols={{ base: 1, md: 3 }}
+          >
+            {data.map((v, k) => (
+              <Paper radius={10} key={k} bg={colors['white-trans-1']}>
+                <Stack gap="xs">
+                  <Center p="10">
+                    <Image
+                      src={v.image?.link}
+                      radius={10}
+                      loading="lazy"
+                      alt=""
+                    />
+                  </Center>
+                  <Box px="xl">
+                    <Box pb="20">
+                      <Title
+                        order={3}
+                        c={colors['blue-button']}
+                        style={{ lineHeight: '1.3' }}
+                      >
+                        {v.judul}
+                      </Title>
+                      <Box>
+                        <Text
+                          pb="10"
+                          fz={{ base: 'xs', md: 'md' }}
+                          lh={{ base: '1.5', md: '1.6' }}
+                          style={{ wordBreak: 'break-word', whiteSpace: 'normal' }}
+                          dangerouslySetInnerHTML={{ __html: v.deskripsi }}
+                        />
                       </Box>
                     </Box>
-                  </Stack>
-                </Paper>
-              )
-            })}
+                  </Box>
+                </Stack>
+              </Paper>
+            ))}
           </SimpleGrid>
         </Stack>
       </Box>
+
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
+          onChange={(newPage) => load(newPage)}
           total={totalPages}
           my="md"
         />
@@ -108,4 +137,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/page.tsx b/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/page.tsx
index f38c60a1..b8bab7ae 100644
--- a/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/page.tsx
+++ b/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import artikelKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/artikelKesehatan';
 import colors from '@/con/colors';
-import { Box, Button, Card, Divider, Group, Image, Loader, Paper, Stack, Text } from '@mantine/core';
+import { Box, Button, Card, Divider, Group, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconCalendar, IconChevronRight } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -17,9 +17,8 @@ function ArtikelKesehatanPage() {
 
   if (!state.findMany.data) {
     return (
-      <Box py="xl" ta="center">
-        <Loader size="lg" color={colors['blue-button']} />
-        <Text mt="md" c="dimmed" fz="md">Memuat artikel kesehatan...</Text>
+      <Box py="lg">
+        <Skeleton h={500} radius="lg" />
       </Box>
     )
   }
diff --git a/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/page.tsx b/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/page.tsx
index 6c843f0c..61b0e609 100644
--- a/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/page.tsx
+++ b/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 import colors from '@/con/colors';
-import { Badge, Box, Button, Card, Divider, Group, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Badge, Box, Button, Card, Divider, Group, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconChevronRight, IconClock, IconMapPin } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -17,12 +17,8 @@ function FasilitasKesehatanPage() {
 
   if (!state.findMany.data) {
     return (
-      <Box py="xl" px="md">
-        <Stack gap="md">
-          <Skeleton height={80} radius="lg" />
-          <Skeleton height={80} radius="lg" />
-          <Skeleton height={80} radius="lg" />
-        </Stack>
+      <Box py="lg">
+        <Skeleton h={500} radius="lg" />
       </Box>
     );
   }
@@ -31,14 +27,20 @@ function FasilitasKesehatanPage() {
     <Box>
       <Paper bg={colors['white-trans-1']} p="xl" radius="xl" shadow="md" h="100%">
         <Stack gap="lg">
-          <Text ta="center" fw={700} fz="32px" c={colors['blue-button']}>
+          <Title
+            order={1}
+            ta="center"
+            fw={700}
+            c={colors['blue-button']}
+            style={{ lineHeight: '1.2' }}
+          >
             Fasilitas Kesehatan
-          </Text>
+          </Title>
           <Divider size="sm" color={colors['blue-button']} />
           <Stack gap="lg">
             {state.findMany.data.length === 0 ? (
               <Box py="xl" ta="center">
-                <Text fz="lg" c="dimmed">
+                <Text size="lg" c="dimmed" lh="1.5">
                   Belum ada fasilitas kesehatan yang tersedia
                 </Text>
               </Box>
@@ -65,22 +67,20 @@ function FasilitasKesehatanPage() {
                 >
                   <Stack gap="sm">
                     <Group justify="space-between" align="center">
-                      <Text fw={700} fz="lg" c={colors['blue-button']}>
-                        {item.name}
-                      </Text>
-                      <Badge color="blue" radius="sm" variant="light" fz="xs">
+                      <Title order={3} fw={700} c={colors['blue-button']} lh="1.3" />
+                      <Badge color="blue" radius="sm" variant="light" size="xs">
                         Aktif
                       </Badge>
                     </Group>
                     <Group gap="xs">
                       <IconMapPin size={18} stroke={1.5} />
-                      <Text fz="sm">
+                      <Text size="sm" lh="1.5">
                         {item.informasiumum.alamat}
                       </Text>
                     </Group>
                     <Group gap="xs">
                       <IconClock size={18} stroke={1.5} />
-                      <Text fz="sm">
+                      <Text size="sm" lh="1.5">
                         {item.informasiumum.jamOperasional}
                       </Text>
                     </Group>
@@ -110,4 +110,4 @@ function FasilitasKesehatanPage() {
   );
 }
 
-export default FasilitasKesehatanPage;
+export default FasilitasKesehatanPage;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/page.tsx b/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/page.tsx
index 7000f374..a0e610c5 100644
--- a/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/page.tsx
+++ b/src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/page.tsx
@@ -6,9 +6,7 @@ import { Box, Center, ColorSwatch, Flex, Paper, SimpleGrid, Skeleton, Stack, Tex
 import { useEffect, useState } from 'react';
 import BackButton from '../../desa/layanan/_com/BackButto';
 
-// import { useRouter } from 'next/navigation';
 import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
-
 import persentasekelahiran from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/persentaseKelahiran';
 import { useProxy } from 'valtio/utils';
 
@@ -17,7 +15,6 @@ import GrafikPenyakit from './grafik-penyakit/page';
 import JadwalKegiatan from './jadwal-kegiatan-page/page';
 import ArtikelKesehatanPage from './artikel-kesehatan-page/page';
 
-
 function Page() {
   type DataTahunan = {
     tahun: string;
@@ -31,7 +28,6 @@ function Page() {
     }>;
   };
 
-  // Count occurrences per year
   const countByYear = (data: any[], dateField: string) => {
     const counts: Record<string, number> = {};
     data?.forEach(item => {
@@ -43,28 +39,23 @@ function Page() {
 
   const statePersentase = useProxy(persentasekelahiran);
   const [chartData, setChartData] = useState<DataTahunan[]>([]);
-  const isTablet = useMediaQuery('(max-width: 1024px)');
   const isMobile = useMediaQuery('(max-width: 768px)');
 
-
   useShallowEffect(() => {
-    statePersentase.kelahiran.findMany.load(1, 1000); // Load all kelahiran data
-    statePersentase.kematian.findMany.load(1, 1000); // Load all kematian data
+    statePersentase.kelahiran.findMany.load(1, 1000);
+    statePersentase.kematian.findMany.load(1, 1000);
   }, []);
 
   useEffect(() => {
     if (statePersentase.kelahiran.findMany.data && statePersentase.kematian.findMany.data) {
-      // Count kelahiran and kematian by year
       const kelahiranByYear = countByYear(statePersentase.kelahiran.findMany.data, 'tanggal');
       const kematianByYear = countByYear(statePersentase.kematian.findMany.data, 'tanggal');
 
-      // Get all unique years
       const allYears = new Set([
         ...Object.keys(kelahiranByYear),
         ...Object.keys(kematianByYear)
       ]);
 
-      // Create data structure for the chart
       const dataByYear = Array.from(allYears).reduce<Record<string, DataTahunan>>((acc, year) => {
         acc[year] = {
           tahun: year,
@@ -93,32 +84,44 @@ function Page() {
       </Stack>
     );
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+
+      {/* Page Title */}
+      <Title
+        order={1}
+        ta="center"
+        c={colors['blue-button']}
+        fw="bold"
+        lh={1.2}
+      >
         Data Kesehatan Masyarakat Puskesmas Darmasaba
-      </Text>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
+      </Title>
+
+      <Box px={{ base: 'md', md: 100 }}>
+        <Stack gap="lg">
           {/* Bar Chart Kematian Kelahiran */}
           <Box>
-            <Paper p={"xl"} bg={colors['white-trans-1']}>
+            <Paper p="xl" bg={colors['white-trans-1']}>
               <Box pb={30}>
-                <Title order={2} mb="md">Data Kematian dan Kelahiran</Title>
+                <Title order={2} mb="md" ta="center">
+                  Data Kematian dan Kelahiran
+                </Title>
+
                 {chartData.length === 0 ? (
-                  <Text c="dimmed" ta="center" py="xl">
+                  <Text c="dimmed" ta="center" py="xl" size="md">
                     Belum ada data yang tersedia untuk ditampilkan
                   </Text>
                 ) : (
                   <>
-                    {/* Main Chart */}
                     <Center>
                       <Box h={400}>
                         <Box style={{
-                          width: isMobile ? '90vw' : isTablet ? '700px' : '800px',
+                          width: isMobile ? '90vw' : '800px',
                           maxWidth: '100%',
                           margin: '0 auto'
                         }}>
@@ -137,16 +140,21 @@ function Page() {
                     </Center>
                   </>
                 )}
-                <Flex pb={30} justify={'center'} gap={'xl'} align={'center'}>
+
+                <Flex pb={30} justify="center" gap="xl" align="center" wrap="wrap">
                   <Box>
-                    <Flex gap={{ base: 0, md: 5 }} align={'center'}>
-                      <Text fw={'bold'} fz={{ base: 'md', md: 'h4' }}>Angka Kematian</Text>
-                      <ColorSwatch  color="#EF3E3E" size={30} />
+                    <Flex gap={{ base: 'xs', md: 'sm' }} align="center">
+                      <Text fw="bold" fz={{ base: 'sm', md: 'md' }}>
+                        Angka Kematian
+                      </Text>
+                      <ColorSwatch color="#EF3E3E" size={30} />
                     </Flex>
                   </Box>
                   <Box>
-                    <Flex gap={{ base: 0, md: 5 }} align={'center'}>
-                      <Text fw={'bold'} fz={{ base: 'md', md: 'h4' }}>Angka Kelahiran</Text>
+                    <Flex gap={{ base: 'xs', md: 'sm' }} align="center">
+                      <Text fw="bold" fz={{ base: 'sm', md: 'md' }}>
+                        Angka Kelahiran
+                      </Text>
                       <ColorSwatch color="#3290CA" size={30} />
                     </Flex>
                   </Box>
@@ -154,20 +162,13 @@ function Page() {
               </Box>
             </Paper>
           </Box>
+
           <GrafikPenyakit />
-          {/* Artikel Kesehatan */}
+
           <Box>
-            <SimpleGrid
-              cols={{
-                base: 1,
-                md: 3,
-              }}
-            >
-              {/* Fasilitas Kesehatan */}
+            <SimpleGrid cols={{ base: 1, md: 3 }}>
               <FasilitasKesehatan />
-              {/* Jadwal Kegiatan */}
               <JadwalKegiatan />
-              {/* Artikel Kesehatan */}
               <ArtikelKesehatanPage />
             </SimpleGrid>
           </Box>
@@ -177,4 +178,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/kesehatan/info-wabah-penyakit/[id]/page.tsx b/src/app/darmasaba/(pages)/kesehatan/info-wabah-penyakit/[id]/page.tsx
index 9fe5ac53..28ab12d4 100644
--- a/src/app/darmasaba/(pages)/kesehatan/info-wabah-penyakit/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/kesehatan/info-wabah-penyakit/[id]/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import infoWabahPenyakit from '@/app/admin/(dashboard)/_state/kesehatan/info-wabah-penyakit/infoWabahPenyakit';
 import colors from '@/con/colors';
-import { Box, Button, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Image, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
@@ -51,10 +51,15 @@ function DetailInfoWabahPenyakitUser() {
         shadow="sm"
       >
         <Stack gap="lg">
-          {/* Judul */}
-          <Text fz="xl" fw="bold" c={colors['blue-button']} ta="center">
+          {/* Judul — H1 */}
+          <Title
+            order={1}
+            fw="bold"
+            c={colors['blue-button']}
+            ta="center"
+          >
             {data.name || 'Kontak Darurat'}
-          </Text>
+          </Title>
 
           {/* Gambar */}
           {data.image?.link && (
@@ -70,10 +75,16 @@ function DetailInfoWabahPenyakitUser() {
 
           {/* Deskripsi */}
           <Box>
-            <Text fz="lg" fw="bold">Deskripsi</Text>
+            {/* Section Title — H2 */}
+            <Title order={2} fw="bold" fz={{ base: 'md', md: 'lg' }} lh="1.4">
+              Deskripsi
+            </Title>
             <Box pl={20}>
               <Text
-                fz="md"
+                fz={{ base: 'sm', md: 'md' }}
+                lh="1.6"
+                c="dimmed"
+                ta={"justify"}
                 dangerouslySetInnerHTML={{ __html: data.deskripsiLengkap || '-' }}
                 style={{ wordBreak: "break-word", whiteSpace: "normal" }}
               />
@@ -85,4 +96,4 @@ function DetailInfoWabahPenyakitUser() {
   );
 }
 
-export default DetailInfoWabahPenyakitUser;
+export default DetailInfoWabahPenyakitUser;
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/kesehatan/posyandu/[id]/page.tsx b/src/app/darmasaba/(pages)/kesehatan/posyandu/[id]/page.tsx
index 1cf5b958..44d7a4e8 100644
--- a/src/app/darmasaba/(pages)/kesehatan/posyandu/[id]/page.tsx
+++ b/src/app/darmasaba/(pages)/kesehatan/posyandu/[id]/page.tsx
@@ -1,7 +1,18 @@
 'use client';
 
 import colors from '@/con/colors';
-import { Button, Center, Flex, Group, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import {
+  Button,
+  Center,
+  Flex,
+  Group,
+  Image,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  Title,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack, IconCalendar, IconInfoCircle, IconPhone } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
@@ -53,15 +64,14 @@ export default function DetailPosyanduUser() {
         mx="auto"
       >
         <Stack gap="md">
-          {/* Header */}
-          <Text
+          {/* Header — Dijadikan Title */}
+          <Title
             ta="center"
-            fz={{ base: '1.8rem', md: '2.2rem' }}
-            fw={700}
+            order={1}
             c={colors['blue-button']}
           >
             {data.name || 'Posyandu Desa'}
-          </Text>
+          </Title>
 
           {/* Gambar */}
           {data.image?.link ? (
@@ -78,7 +88,7 @@ export default function DetailPosyanduUser() {
             </Center>
           ) : (
             <Center>
-              <Text fz="sm" c="dimmed">
+              <Text fz={{ base: 'xs', md: 'sm' }} c="dimmed">
                 Tidak ada gambar
               </Text>
             </Center>
@@ -88,7 +98,11 @@ export default function DetailPosyanduUser() {
           <Stack gap="sm" mt="md">
             <Flex align="center" gap="xs">
               <IconPhone size={18} stroke={1.5} />
-              <Text fz="sm" c="dimmed">
+              <Text
+                fz={{ base: 'xs', md: 'sm' }}
+                c="dimmed"
+                lh={{ base: 1.5, md: 1.6 }}
+              >
                 {data.nomor || 'Nomor tidak tersedia'}
               </Text>
             </Flex>
@@ -96,8 +110,9 @@ export default function DetailPosyanduUser() {
             <Flex align="center" gap="xs">
               <IconCalendar size={18} stroke={1.5} />
               <Text
-                fz="sm"
+                fz={{ base: 'xs', md: 'sm' }}
                 c="dimmed"
+                lh={{ base: 1.5, md: 1.6 }}
                 dangerouslySetInnerHTML={{ __html: data.jadwalPelayanan || '-' }}
                 style={{ wordBreak: 'break-word', whiteSpace: 'normal' }}
               />
@@ -106,9 +121,9 @@ export default function DetailPosyanduUser() {
             <Flex align="center" gap="xs">
               <IconInfoCircle size={18} stroke={1.5} />
               <Text
-                fz="sm"
+                fz={{ base: 'xs', md: 'sm' }}
                 c="dimmed"
-                lh={1.6}
+                lh={{ base: 1.5, md: 1.6 }}
                 dangerouslySetInnerHTML={{ __html: data.deskripsi || '-' }}
                 style={{ wordBreak: 'break-word', whiteSpace: 'normal' }}
               />
@@ -118,4 +133,4 @@ export default function DetailPosyanduUser() {
       </Paper>
     </Stack>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/darmasaba/(pages)/kesehatan/posyandu/page.tsx b/src/app/darmasaba/(pages)/kesehatan/posyandu/page.tsx
index c567f34f..18a749c3 100644
--- a/src/app/darmasaba/(pages)/kesehatan/posyandu/page.tsx
+++ b/src/app/darmasaba/(pages)/kesehatan/posyandu/page.tsx
@@ -1,7 +1,7 @@
 'use client'
 import posyandustate from "@/app/admin/(dashboard)/_state/kesehatan/posyandu/posyandu";
 import colors from "@/con/colors";
-import { Badge, Box, Button, Center, Flex, Group, Image, List, ListItem, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from "@mantine/core";
+import { Badge, Box, Button, Center, Flex, Group, Image, List, ListItem, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from "@mantine/core";
 import { useDebouncedValue, useShallowEffect } from "@mantine/hooks";
 import { IconCalendar, IconInfoCircle, IconPhone, IconSearch } from "@tabler/icons-react";
 import { useState } from "react";
@@ -12,8 +12,8 @@ import { useTransitionRouter } from "next-view-transitions";
 export default function Page() {
   const state = useProxy(posyandustate);
   const [search, setSearch] = useState("");
-  const [debouncedSearch] = useDebouncedValue(search, 1000); // 500ms delay
-  const router = useTransitionRouter()
+  const [debouncedSearch] = useDebouncedValue(search, 1000);
+  const router = useTransitionRouter();
 
   const { data, page, totalPages, loading, load } = state.findMany;
 
@@ -35,14 +35,13 @@ export default function Page() {
         <Box px={{ base: "md", md: 100 }}>
           <BackButton />
           <Flex mt="md" justify="space-between" align="center" wrap="wrap" gap="md">
-            <Text
+            <Title
+              order={1}
               ta="left"
-              fz={{ base: "1.8rem", md: "2.5rem" }}
               c={colors["blue-button"]}
-              fw="bold"
             >
               Posyandu Desa Darmasaba
-            </Text>
+            </Title>
             <TextInput
               placeholder="Cari posyandu berdasarkan nama..."
               aria-label="Pencarian Posyandu"
@@ -55,6 +54,7 @@ export default function Page() {
             />
           </Flex>
         </Box>
+        <Title c={"dimmed"} order={3} ta={"center"}>Belum ada posyandu yang terdaftar</Title>
       </Stack>
     );
   }
@@ -64,14 +64,13 @@ export default function Page() {
       <Box px={{ base: "md", md: 100 }}>
         <BackButton />
         <Flex mt="md" justify="space-between" align="center" wrap="wrap" gap="md">
-          <Text
+          <Title
+            order={1}
             ta="left"
-            fz={{ base: "1.8rem", md: "2.5rem" }}
             c={colors["blue-button"]}
-            fw="bold"
           >
             Posyandu Desa Darmasaba
-          </Text>
+          </Title>
           <TextInput
             placeholder="Cari posyandu berdasarkan nama..."
             aria-label="Pencarian Posyandu"
@@ -116,9 +115,9 @@ export default function Page() {
               >
                 <Stack gap="sm">
                   <Group justify="space-between" align="center">
-                    <Text c={colors["blue-button"]} fw="bold" fz="lg" lineClamp={1}>
+                    <Title order={3} c={colors["blue-button"]} fw="bold" lineClamp={1}>
                       {v.name}
-                    </Text>
+                    </Title>
                     <Badge color="blue" variant="light" size="sm" radius="sm">
                       Aktif
                     </Badge>
@@ -137,7 +136,7 @@ export default function Page() {
                   <Flex align="flex-start" gap="xs">
                     <IconPhone size={18} stroke={1.5} style={{ marginTop: 3 }} />
                     <Box>
-                      <Text fz="sm" c="dimmed" lh={1.4}>
+                      <Text fz={{ base: "xs", md: "sm" }} c="dimmed" lh={1.4}>
                         {v.nomor || "Tidak tersedia"}
                       </Text>
                     </Box>
@@ -146,7 +145,7 @@ export default function Page() {
                   <Flex align="flex-start" gap="xs">
                     <IconCalendar size={18} stroke={1.5} style={{ marginTop: 3 }} />
                     <Box>
-                      <Text fz="sm" c="dimmed" lh={1.4}>
+                      <Text fz={{ base: "xs", md: "sm" }} c="dimmed" lh={1.4}>
                         <strong>Jadwal:</strong>{" "}
                         <span
                           style={{ wordBreak: "break-word", whiteSpace: "normal" }}
@@ -159,7 +158,7 @@ export default function Page() {
                   <Flex align="flex-start" gap="xs">
                     <IconInfoCircle size={18} stroke={1.5} style={{ marginTop: 3 }} />
                     <Text
-                      fz="sm"
+                      fz={{ base: "xs", md: "sm" }}
                       lh={1.5}
                       c="dimmed"
                       dangerouslySetInnerHTML={{ __html: v.deskripsi }}
@@ -168,7 +167,9 @@ export default function Page() {
                       truncate="end"
                     />
                   </Flex>
-                  <Button radius="lg" size="md" variant="outline" onClick={() => router.push(`/darmasaba/kesehatan/posyandu/${v.id}`)}>Detail</Button>
+                  <Button radius="lg" size="md" variant="outline" onClick={() => router.push(`/darmasaba/kesehatan/posyandu/${v.id}`)}>
+                    Detail
+                  </Button>
                 </Stack>
               </Paper>
             ))}
@@ -191,11 +192,11 @@ export default function Page() {
           <Stack gap="sm">
             <Flex align="center" gap="xs">
               <IconInfoCircle size={22} color={colors["blue-button"]} />
-              <Text fz="lg" fw="bold" c={colors["blue-button"]}>
+              <Title order={2} c={colors["blue-button"]}>
                 Layanan Utama Posyandu
-              </Text>
+              </Title>
             </Flex>
-            <List spacing="xs" size="sm" center>
+            <List spacing="xs" fz={{ base: "xs", md: "sm" }} center>
               <ListItem>Penimbangan bayi dan balita</ListItem>
               <ListItem>Pemantauan status gizi</ListItem>
               <ListItem>Imunisasi dasar lengkap</ListItem>
diff --git a/src/app/darmasaba/(pages)/ppid/struktur-ppid/page.tsx b/src/app/darmasaba/(pages)/ppid/struktur-ppid/page.tsx
index e4ccf7e8..89a35181 100644
--- a/src/app/darmasaba/(pages)/ppid/struktur-ppid/page.tsx
+++ b/src/app/darmasaba/(pages)/ppid/struktur-ppid/page.tsx
@@ -91,7 +91,7 @@ function StrukturOrganisasiPPID() {
   const debouncedSearch = useRef(
     debounce((value: string) => {
       setSearchQuery(value)
-    }, 400)
+    }, 1000)
   ).current
 
   useEffect(() => {
diff --git a/src/app/darmasaba/(tambahan)/penghargaan/page.tsx b/src/app/darmasaba/(tambahan)/penghargaan/page.tsx
index 91496413..b68d90ba 100644
--- a/src/app/darmasaba/(tambahan)/penghargaan/page.tsx
+++ b/src/app/darmasaba/(tambahan)/penghargaan/page.tsx
@@ -2,7 +2,7 @@
 'use client';
 import penghargaanState from "@/app/admin/(dashboard)/_state/desa/penghargaan";
 import colors from "@/con/colors";
-import { Box, Button, Container, Group, Paper, Skeleton, Stack, Text } from "@mantine/core";
+import { Box, Button, Container, Group, Paper, Skeleton, Stack, Text, Title } from "@mantine/core";
 import { useMediaQuery } from "@mantine/hooks";
 import { IconArrowRight, IconAward } from "@tabler/icons-react";
 import { useTransitionRouter } from "next-view-transitions";
@@ -20,11 +20,21 @@ export default function Page() {
         <Stack align="center" gap="sm">
           <Group gap="xs">
             <IconAward size={40} color={colors["blue-button"]} />
-            <Text fz={{ base: "2rem", md: "3.2rem" }} fw={800} variant="gradient" gradient={{ from: "#1C6EA4", to: "#69BFF8" }}>
+            <Title
+              order={1}
+              fw={800}
+              c={colors["blue-button"]}
+              ta="center"
+            >
               Penghargaan Desa
-            </Text>
+            </Title>
           </Group>
-          <Text fz="lg" c="dimmed" ta="center">
+          <Text
+            fz={{ base: "sm", md: "md" }}
+            lh={{ base: "1.5", md: "1.6" }}
+            c="black"
+            ta="center"
+          >
             Desa Darmasaba berhasil meraih beragam penghargaan bergengsi yang mencerminkan dedikasi dan kerja keras masyarakat dalam membangun desa yang maju dan berkelanjutan.
           </Text>
         </Stack>
@@ -61,10 +71,8 @@ function Slider() {
   const data = state.findMany.data || [];
   const loading = state.findMany.loading;
 
-  // Triple data untuk infinite loop (desktop only)
   const slidesData = mobile ? data : [...data, ...data, ...data];
 
-  // Auto-scroll animation untuk desktop
   useEffect(() => {
     if (loading || !containerRef.current || data.length === 0 || mobile) return;
 
@@ -72,7 +80,6 @@ function Slider() {
     const slideWidth = container.scrollWidth / slidesData.length;
     const originalLength = data.length;
 
-    // Start dari middle set
     scrollPosRef.current = slideWidth * originalLength;
     container.scrollLeft = scrollPosRef.current;
 
@@ -88,7 +95,6 @@ function Slider() {
         const speed = isHoveredRef.current ? SPEED_HOVER : SPEED_NORMAL;
         scrollPosRef.current += speed;
 
-        // Reset untuk infinite loop
         if (scrollPosRef.current >= slideWidth * (originalLength * 2)) {
           scrollPosRef.current -= slideWidth * originalLength;
         }
@@ -100,7 +106,6 @@ function Slider() {
       } else {
         scrollPosRef.current = container.scrollLeft;
 
-        // Momentum untuk drag release
         if (!isDraggingRef.current && Math.abs(velocityRef.current) > 0.1) {
           scrollPosRef.current += velocityRef.current;
           velocityRef.current *= VELOCITY_DECAY;
@@ -185,7 +190,7 @@ function Slider() {
     return (
       <Stack align="center" py="xl">
         <IconAward size={56} color={colors["blue-button"]} />
-        <Text fz="lg" fw={600} c="dimmed">
+        <Text fz={{ base: "sm", md: "md" }} fw={600} c="dimmed" ta="center">
           Belum ada penghargaan yang ditambahkan
         </Text>
       </Stack>
@@ -213,7 +218,6 @@ function Slider() {
         msOverflowStyle: "none",
       }}
     >
-      {/* Blur edges - hanya untuk desktop */}
       {!mobile && (
         <>
           <Box
@@ -291,8 +295,8 @@ function Slider() {
                 style={{ borderRadius: 16 }}
               />
               <Stack justify="flex-end" h="100%" gap="sm" p="lg" pos="relative">
-                <Text
-                  fz={{ base: "lg", sm: "xl", md: "1.5rem" }}
+                <Title
+                  order={3}
                   fw={700}
                   ta="center"
                   c="white"
@@ -300,7 +304,7 @@ function Slider() {
                   style={{ textShadow: "0 2px 8px rgba(0,0,0,0.8)" }}
                 >
                   {item.name}
-                </Text>
+                </Title>
                 <Group justify="center">
                   <Button
                     onClick={() => router.push(`/darmasaba/penghargaan/${item.id}`)}
diff --git a/src/app/darmasaba/_com/NavbarMainMenu.tsx b/src/app/darmasaba/_com/NavbarMainMenu.tsx
index 96548a8e..79ef6134 100644
--- a/src/app/darmasaba/_com/NavbarMainMenu.tsx
+++ b/src/app/darmasaba/_com/NavbarMainMenu.tsx
@@ -74,7 +74,7 @@ export function NavbarMainMenu({ listNavbar }: { listNavbar: MenuItem[] }) {
             <Tooltip label="Profil Saya" position="bottom" withArrow>
               <ActionIcon
                 onClick={() => {
-                  next.push("/admin/landing-page/profile/program-inovasi")
+                  next.push("/admin/landing-page/profil/program-inovasi")
                 }}
                 color={colors["blue-button"]}
                 radius="xl"
diff --git a/src/app/darmasaba/_com/main-page/potensi/index.tsx b/src/app/darmasaba/_com/main-page/potensi/index.tsx
index 33d42aac..d469ede1 100644
--- a/src/app/darmasaba/_com/main-page/potensi/index.tsx
+++ b/src/app/darmasaba/_com/main-page/potensi/index.tsx
@@ -96,7 +96,7 @@ function Potensi() {
         </Stack>
       ) : (
         /* CARD LIST */
-        <SimpleGrid cols={{ base: 1, sm: 2 }}>
+        <SimpleGrid cols={{ base: 1, sm: 2 }} px={{base: 'md', md: 80}}>
           {_.take(data, 4).map((v, k) => (
             <motion.div
               key={k}
diff --git a/src/app/darmasaba/_com/searchUrl.tsx b/src/app/darmasaba/_com/searchUrl.tsx
index 4ce896b9..2eca0785 100644
--- a/src/app/darmasaba/_com/searchUrl.tsx
+++ b/src/app/darmasaba/_com/searchUrl.tsx
@@ -6,20 +6,20 @@ const getDetailUrl = (item: { type?: string; id: string | number;[key: string]:
     sdgsdesa: () => '/darmasaba/sdgs-desa',
     apbdes: () => '/darmasaba/apbdes',
     prestasidesa: () => '/darmasaba/prestasi-desa',
-    pejabatdesa: () => '/darmasaba/ppid/profile-ppid',
+    pejabatdesa: () => '/darmasaba/ppid/profil-ppid',
     strukturppid: () => '/darmasaba/ppid/struktur-ppid',
     visimisippid: () => '/darmasaba/ppid/visi-misi',
     dasarhukumppid: () => '/darmasaba/ppid/dasar-hukum',
-    profileppid: () => '/darmasaba/ppid/profile',
+    profileppid: () => '/darmasaba/ppid/profil',
     daftarinformasipublik: () => '/darmasaba/ppid/daftar-informasi-publik',
-    perbekeldarmasaba: () => '/darmasaba/desa/profile',
+    perbekeldarmasaba: () => '/darmasaba/desa/profil',
     berita: (id, kategori) => `/darmasaba/desa/berita/${kategori}/${id}`,
     pengumuman: (id, kategori) => `/darmasaba/desa/pengumuman/${kategori}/${id}`,
-    sejarahdesa: () => '/darmasaba/desa/profile',
-    visimisidesa: () => '/darmasaba/desa/profile',
-    lambangdesa: () => '/darmasaba/desa/profile',
-    maskotdesa: () => '/darmasaba/desa/profile',
-    profilperbekel: () => '/darmasaba/desa/profile',
+    sejarahdesa: () => '/darmasaba/desa/profil',
+    visimisidesa: () => '/darmasaba/desa/profil',
+    lambangdesa: () => '/darmasaba/desa/profil',
+    maskotdesa: () => '/darmasaba/desa/profil',
+    profilperbekel: () => '/darmasaba/desa/profil',
     potensi: () => '/darmasaba/desa/potensi-desa',
     galleryFoto: () => '/darmasaba/desa/gallery/foto',
     galleryVideo: () => '/darmasaba/desa/gallery/video',