From 7ae83788b4ee41840e3bc68e6ad539fc30127bd1 Mon Sep 17 00:00:00 2001
From: nico <nicoarya20@gmail.com>
Date: Mon, 1 Sep 2025 16:14:28 +0800
Subject: [PATCH] Fix UI Admin Menu Landing Page & PPID

---
 .../landing-page/apbdes/[id]/edit/page.tsx    | 359 ++++++++++--------
 .../landing-page/apbdes/[id]/page.tsx         | 166 ++++----
 .../landing-page/apbdes/create/page.tsx       | 289 ++++++++------
 .../(dashboard)/landing-page/apbdes/page.tsx  | 114 +++---
 .../desa-anti-korupsi/_lib/layouTabs.tsx      |   2 +-
 .../kategori-desa-anti-korupsi/[id]/page.tsx  |   2 +-
 .../create/page.tsx                           |   2 +-
 .../kategori-desa-anti-korupsi/page.tsx       |   2 +-
 .../list-desa-anti-korupsi/[id]/edit/page.tsx |   2 +-
 .../list-desa-anti-korupsi/[id]/page.tsx      |   1 +
 .../list-desa-anti-korupsi/create/page.tsx    |   2 +-
 .../list-desa-anti-korupsi/page.tsx           | 144 ++++---
 .../_lib/layoutTab.tsx                        | 130 ++++---
 .../grafik-kepuasan-masyarakat/page.tsx       |  90 ++---
 .../responden/[id]/edit/page.tsx              | 102 +++--
 .../responden/[id]/page.tsx                   | 120 +++---
 .../responden/page.tsx                        | 145 ++++---
 .../prestasi-desa/_lib/layoutTabs.tsx         | 137 ++++---
 .../kategori-prestasi-desa/[id]/page.tsx      |  54 ++-
 .../kategori-prestasi-desa/create/page.tsx    |  66 ++--
 .../kategori-prestasi-desa/page.tsx           | 119 ++++--
 .../list-prestasi-desa/[id]/edit/page.tsx     | 248 ++++++------
 .../list-prestasi-desa/[id]/page.tsx          | 126 +++---
 .../list-prestasi-desa/create/page.tsx        | 180 +++++----
 .../prestasi-desa/list-prestasi-desa/page.tsx | 123 +++---
 .../landing-page/profile/_lib/layoutTabs.tsx  |   2 +-
 .../profile/media-sosial/[id]/edit/page.tsx   |   2 +-
 .../profile/media-sosial/[id]/page.tsx        |   1 +
 .../profile/media-sosial/create/page.tsx      |   2 +-
 .../profile/media-sosial/page.tsx             |  36 +-
 .../profile/pejabat-desa/[id]/page.tsx        |   2 +-
 .../profile/pejabat-desa/page.tsx             |   4 +-
 .../program-inovasi/[id]/edit/page.tsx        |  20 +-
 .../profile/program-inovasi/[id]/page.tsx     |  31 +-
 .../profile/program-inovasi/create/page.tsx   |   2 +-
 .../profile/program-inovasi/page.tsx          |   6 +-
 .../landing-page/sdgs-desa/[id]/edit/page.tsx | 167 ++++----
 .../landing-page/sdgs-desa/[id]/page.tsx      | 136 ++++---
 .../landing-page/sdgs-desa/create/page.tsx    | 184 +++++----
 .../landing-page/sdgs-desa/page.tsx           | 139 ++++---
 .../[id]/edit/page.tsx                        |   2 +-
 .../create/page.tsx                           |   2 +-
 .../[id]/page.tsx                             |   2 +-
 .../page.tsx                                  |   2 +-
 .../keunggulan-program/[id]/page.tsx          |   2 +-
 .../beasiswa-desa/keunggulan-program/page.tsx |   2 +-
 .../[id]/edit/page.tsx                        |  72 +++-
 .../[id]/page.tsx                             | 135 ++++---
 .../create/page.tsx                           | 136 +++++--
 .../page.tsx                                  | 148 ++++----
 .../ppid/dasar-hukum/edit/page.tsx            |  85 +++--
 .../(dashboard)/ppid/dasar-hukum/page.tsx     |  90 +++--
 .../ikm-desa-darmasaba/_lib/layoutTabs.tsx    |  59 ++-
 .../indeks-kepuasan-masyarakat/page.tsx       |  72 ++--
 .../responden/[id]/edit/page.tsx              | 100 +++--
 .../responden/[id]/page.tsx                   | 120 +++---
 .../ikm-desa-darmasaba/responden/page.tsx     | 159 ++++----
 .../ppid/permohonan-informasi-publik/page.tsx | 132 ++++---
 .../page.tsx                                  | 123 ++++--
 .../ppid/profile-ppid/[id]/page.tsx           | 230 +++++------
 .../(dashboard)/ppid/profile-ppid/page.tsx    | 165 ++++----
 .../ppid/struktur-ppid/_lib/layoutTabs.tsx    |  97 +++--
 .../struktur-ppid/pegawai/[id]/edit/page.tsx  | 295 ++++++++------
 .../ppid/struktur-ppid/pegawai/[id]/page.tsx  | 204 +++++-----
 .../struktur-ppid/pegawai/create/page.tsx     | 308 +++++++++------
 .../ppid/struktur-ppid/pegawai/page.tsx       | 128 ++++---
 .../posisi-organisasi/[id]/page.tsx           |  73 +++-
 .../posisi-organisasi/create/page.tsx         | 177 +++++----
 .../struktur-ppid/posisi-organisasi/page.tsx  | 141 ++++---
 .../struktur-organisasi/page.tsx              |  82 ++--
 .../ppid/visi-misi-ppid/edit/page.tsx         |  82 ++--
 .../(dashboard)/ppid/visi-misi-ppid/page.tsx  | 127 ++++---
 .../(tambahan)/program-inovasi/[id]/page.tsx  |  97 +++++
 .../main-page/landing-page/ModuleView.tsx     |   2 +-
 74 files changed, 4312 insertions(+), 2798 deletions(-)
 create mode 100644 src/app/darmasaba/(tambahan)/program-inovasi/[id]/page.tsx

diff --git a/src/app/admin/(dashboard)/landing-page/apbdes/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/apbdes/[id]/edit/page.tsx
index e40d354f..4d4c74f9 100644
--- a/src/app/admin/(dashboard)/landing-page/apbdes/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/apbdes/[id]/edit/page.tsx
@@ -1,26 +1,27 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-"use client";
+'use client';
 
-
-import apbdes from "@/app/admin/(dashboard)/_state/landing-page/apbdes";
-import colors from "@/con/colors";
-import ApiFetch from "@/lib/api-fetch";
+import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
+import colors from '@/con/colors';
+import ApiFetch from '@/lib/api-fetch';
 import {
   Box,
   Button,
   Group,
+  Image,
   Paper,
   Stack,
   Text,
   TextInput,
-  Title
-} from "@mantine/core";
-import { Dropzone } from "@mantine/dropzone";
-import { IconArrowBack, IconFile, IconImageInPicture, IconUpload, IconX } from "@tabler/icons-react";
-import { useParams, useRouter } from "next/navigation";
-import { useEffect, useState } from "react";
-import { toast } from "react-toastify";
-import { useProxy } from "valtio/utils";
+  Title,
+  Tooltip,
+} from '@mantine/core';
+import { Dropzone } from '@mantine/dropzone';
+import { IconArrowBack, IconFile, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
 
 function EditAPBDes() {
   const apbdesState = useProxy(apbdes);
@@ -38,14 +39,14 @@ function EditAPBDes() {
     fileId: apbdesState.edit.form.fileId || ''
   });
 
-  // Load sdgs desa by id saat pertama kali
+  // Load APBDes data by id
   useEffect(() => {
-    const loadKolaborasi = async () => {
+    const loadAPBDes = async () => {
       const id = params?.id as string;
       if (!id) return;
 
       try {
-        const data = await apbdesState.edit.load(id); // akses langsung, bukan dari proxy
+        const data = await apbdesState.edit.load(id);
         if (data) {
           setFormData({
             name: data.name || '',
@@ -53,202 +54,238 @@ function EditAPBDes() {
             imageId: data.imageId || '',
             fileId: data.fileId || ''
           });
-          if (data.image) {
-            if (data?.image?.link) {
-              setPreviewImage(data.image.link);
-            }
-          }
-          if (data.file) {
-            if (data?.file?.link) {
-              setPreviewDoc(data.file.link);
-            }
-          }
+          
+          if (data.image?.link) setPreviewImage(data.image.link);
+          if (data.file?.link) setPreviewDoc(data.file.link);
         }
       } catch (error) {
-        console.error("Error loading apbdes:", error);
-        toast.error("Gagal memuat data apbdes");
+        console.error('Error loading APBDes:', error);
+        toast.error('Gagal memuat data APBDes');
       }
     };
 
-    loadKolaborasi();
+    loadAPBDes();
   }, [params?.id]);
 
   const handleSubmit = async () => {
-
     try {
-      // edit global state with form data
+      // Update global state with form data
       apbdesState.edit.form = {
         ...apbdesState.edit.form,
-        name: formData.name,
-        jumlah: formData.jumlah,
-        imageId: formData.imageId // Keep existing imageId if not changed
+        ...formData,
       };
 
-      // Jika ada file image baru, upload
+      // Upload new image if exists
       if (imageFile) {
-        const res = await ApiFetch.api.fileStorage.create.post({ file: imageFile, name: imageFile.name });
+        const res = await ApiFetch.api.fileStorage.create.post({ 
+          file: imageFile, 
+          name: imageFile.name 
+        });
         const uploaded = res.data?.data;
 
         if (!uploaded?.id) {
-          return toast.error("Gagal upload gambar");
+          return toast.error('Gagal upload gambar');
         }
 
-        // edit imageId in global state
         apbdesState.edit.form.imageId = uploaded.id;
       }
 
-      // Jika ada file doc baru, upload
+      // Upload new document if exists
       if (docFile) {
-        const res = await ApiFetch.api.fileStorage.create.post({ file: docFile, name: docFile.name });
+        const res = await ApiFetch.api.fileStorage.create.post({ 
+          file: docFile, 
+          name: docFile.name 
+        });
         const uploaded = res.data?.data;
 
         if (!uploaded?.id) {
-          return toast.error("Gagal upload doc");
+          return toast.error('Gagal upload dokumen');
         }
 
-        // edit fileId in global state
         apbdesState.edit.form.fileId = uploaded.id;
       }
 
       await apbdesState.edit.update();
-      toast.success("apbdes berhasil diperbarui!");
-      router.push("/admin/landing-page/APBDes");
+      toast.success('APBDes berhasil diperbarui!');
+      router.push('/admin/landing-page/APBDes');
     } catch (error) {
-      console.error("Error updating apbdes:", error);
-      toast.error("Terjadi kesalahan saat memperbarui apbdes");
+      console.error('Error updating APBDes:', error);
+      toast.error('Terjadi kesalahan saat memperbarui APBDes');
     }
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors["blue-button"]} size={30} />
-        </Button>
-      </Box>
-      <Paper bg={"white"} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Edit APBDes</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit APBDes
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label="Nama APBDes"
+            placeholder="Masukkan nama APBDes"
             value={formData.name}
             onChange={(e) => setFormData({ ...formData, name: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Nama</Text>}
-            placeholder="masukkan nama"
+            required
           />
 
           <TextInput
+            label="Jumlah Anggaran"
+            placeholder="Masukkan jumlah anggaran"
             value={formData.jumlah}
             onChange={(e) => setFormData({ ...formData, jumlah: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Jumlah</Text>}
-            placeholder="masukkan jumlah"
+            required
           />
-          <Box>
-            <Text fz={"md"} fw={"bold"}>File Image</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setImageFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.jpeg', '.jpg', '.png', '.gif', '.webp', '.svg'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconImageInPicture size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih image
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format image
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Image</Text>
-                {previewImage ? (
-                  <iframe
-                    src={previewImage}
-                    width="100%"
-                    height="500px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                  />
-                ) : (
-                  <Text>Tidak ada image tersedia</Text>
-                )}
-              </Box>
-            </Box>
-          </Box>
           <Box>
-            <Text fz={"md"} fw={"bold"}>File Doc</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setDocFile(selectedFile);
-                    setPreviewDoc(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.pdf', '.doc', '.docx'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconFile size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar APBDes
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setImageFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar wajib
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format doc
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Dokumen</Text>
-                {previewDoc ? (
-                  <iframe
-                    src={previewDoc}
-                    width="100%"
-                    height="500px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                  />
-                ) : (
-                  <Text>Tidak ada doc tersedia</Text>
-                )}
+            {previewImage && (
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{ 
+                    maxHeight: 300, 
+                    objectFit: 'contain', 
+                    border: `1px solid ${colors['blue-button']}` 
+                  }}
+                />
               </Box>
-            </Box>
+            )}
           </Box>
-          <Button onClick={handleSubmit}>Simpan</Button>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Dokumen APBDes
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setDocFile(selectedFile);
+                  setPreviewDoc(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format dokumen')}
+              maxSize={10 * 1024 ** 2} // 10MB
+              accept={{
+                'application/pdf': ['.pdf'],
+                'application/msword': ['.doc'],
+                'application/vnd.openxmlformats-officedocument.wordprocessingml.document': ['.docx'],
+                'application/vnd.ms-excel': ['.xls'],
+                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx'],
+              }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={150}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconFile size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret dokumen atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 10MB, format PDF/DOC/DOCX/XLS/XLSX
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
+
+            {previewDoc && (
+              <Box mt="sm">
+                <Text size="sm" c="dimmed" mb="xs">
+                  Dokumen terpilih: {docFile?.name || 'Dokumen'}
+                </Text>
+                <Button
+                  component="a"
+                  href={previewDoc}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  variant="light"
+                  leftSection={<IconFile size={16} />}
+                  size="sm"
+                >
+                  Lihat Dokumen
+                </Button>
+              </Box>
+            )}
+          </Box>
+
+          <Group justify="right" mt="md">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/landing-page/apbdes/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/apbdes/[id]/page.tsx
index cb535f3c..c04d6e61 100644
--- a/src/app/admin/(dashboard)/landing-page/apbdes/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/apbdes/[id]/page.tsx
@@ -1,9 +1,9 @@
 'use client'
 import { useProxy } from 'valtio/utils';
 
-import { ActionIcon, Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconFile, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconFile, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 
@@ -35,89 +35,125 @@ function DetailAPBDes() {
   if (!apbdesState.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={40} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = apbdesState.findUnique.data;
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail APBDes</Text>
-          {apbdesState.findUnique.data ? (
-            <Paper key={apbdesState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Nama APBDes</Text>
-                  <Text fz={"lg"}>{apbdesState.findUnique.data?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Jumlah</Text>
-                  <Text fz={"lg"}>{apbdesState.findUnique.data?.jumlah}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Gambar</Text>
-                  <Image w={{ base: 150, md: 150, lg: 150 }} src={apbdesState.findUnique.data?.image?.link} alt="gambar" />
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Dokumen</Text>
-                  {apbdesState.findUnique.data?.file?.link ? (
-                    <ActionIcon
-                      component="a"
-                      href={apbdesState.findUnique.data.file.link}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      variant="transparent"
-                    >
-                      <IconFile size={25} color={colors['blue-button']}/>
-                    </ActionIcon>
-                  ) : (
-                    <Text>Tidak ada dokumen tersedia</Text>
-                  )}
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "60%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail APBDes
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="md">
+              <Box>
+                <Text fz="lg" fw="bold">Nama APBDes</Text>
+                <Text fz="md" c="dimmed">{data.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jumlah Anggaran</Text>
+                <Text fz="md" c="dimmed">Rp. {data.jumlah || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Gambar</Text>
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.name || 'Gambar APBDes'}
+                    w={200}
+                    height={150}
+                    radius="md"
+                    fit="contain"
+                    style={{ border: '1px solid #ddd' }}
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Dokumen</Text>
+                {data.file?.link ? (
                   <Button
-                    onClick={() => {
-                      if (apbdesState.findUnique.data) {
-                        setSelectedId(apbdesState.findUnique.data.id);
-                        setModalHapus(true);
-                      }
-                    }}
-                    disabled={apbdesState.delete.loading || !apbdesState.findUnique.data}
-                    color={"red"}
+                    component="a"
+                    href={data.file.link}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    variant="light"
+                    leftSection={<IconFile size={18} />}
+                    size="sm"
+                    mt="xs"
                   >
-                    <IconX size={20} />
+                    Lihat Dokumen
                   </Button>
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada dokumen</Text>
+                )}
+              </Box>
+
+              <Group gap="sm" mt="md">
+                <Tooltip label="Hapus APBDes" withArrow position="top">
                   <Button
+                    color="red"
                     onClick={() => {
-                      if (apbdesState.findUnique.data) {
-                        router.push(`/admin/landing-page/APBDes/${apbdesState.findUnique.data.id}/edit`);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                     }}
-                    disabled={!apbdesState.findUnique.data}
-                    color={"green"}
+                    disabled={apbdesState.delete.loading}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconTrash size={20} />
+                  </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit APBDes" withArrow position="top">
+                  <Button
+                    color="green"
+                    onClick={() => router.push(`/admin/landing-page/APBDes/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
         </Stack>
       </Paper>
 
-      {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus APBDes ini?'
+        text="Apakah Anda yakin ingin menghapus APBDes ini?"
       />
     </Box>
   );
diff --git a/src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx b/src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx
index f9023bbb..2450129a 100644
--- a/src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx
@@ -1,10 +1,21 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Image,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconFile, IconImageInPicture, IconUpload, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconFile, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
@@ -70,140 +81,168 @@ function CreateAPBDes() {
   };
   
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah APBDes
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create APBDes</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          {/* Gambar APBDes */}
           <Box>
-            <Text fz={"md"} fw={"bold"}>File Image</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setImageFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.jpeg', '.jpg', '.png', '.gif', '.webp', '.svg'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconImageInPicture size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar APBDes
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setImageFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+                <Box>
+                  <Text size="xl" inline>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed" inline display="block" mt={7}>
+                    Maksimal 5MB (format: JPEG, JPG, PNG, GIF, WEBP, SVG)
+                  </Text>
+                </Box>
+              </Group>
+            </Dropzone>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format image
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Dokumen</Text>
-                {previewImage ? (
-                  <iframe
-                    src={previewImage}
-                    width="100%"
-                    height="500px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                  />
-                ) : (
-                  <Text>Tidak ada image tersedia</Text>
-                )}
+            {previewImage && (
+              <Box mt="md" style={{ textAlign: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{ maxHeight: 200, objectFit: 'contain', border: '1px solid #ddd' }}
+                />
               </Box>
-            </Box>
+            )}
           </Box>
+
+          {/* Dokumen APBDes */}
           <Box>
-            <Text fz={"md"} fw={"bold"}>File Dokumen</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setDocFile(selectedFile);
-                    setPreviewDoc(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.pdf', '.doc', '.docx'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconFile size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Dokumen APBDes
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setDocFile(selectedFile);
+                  setPreviewDoc(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format PDF, DOC, atau DOCX')}
+              maxSize={5 * 1024 ** 2}
+              accept={{
+                'application/pdf': ['.pdf'],
+                'application/msword': ['.doc'],
+                'application/vnd.openxmlformats-officedocument.wordprocessingml.document': ['.docx'],
+              }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconFile size={48} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+                <Box>
+                  <Text size="xl" inline>
+                    Seret dokumen atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed" inline display="block" mt={7}>
+                    Maksimal 5MB (format: PDF, DOC, DOCX)
+                  </Text>
+                </Box>
+              </Group>
+            </Dropzone>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format dokumen
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Dokumen</Text>
-                {previewDoc ? (
-                  <iframe
-                    src={previewDoc}
-                    width="100%"
-                    height="500px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                  />
-                ) : (
-                  <Text>Tidak ada dokumen tersedia</Text>
-                )}
+            {previewDoc && (
+              <Box mt="md">
+                <Text fw="bold" fz="sm" mb={6}>
+                  Pratinjau Dokumen
+                </Text>
+                <iframe
+                  src={previewDoc}
+                  width="100%"
+                  height="500px"
+                  style={{ border: '1px solid #ddd', borderRadius: '8px' }}
+                />
               </Box>
-            </Box>
+            )}
           </Box>
+
+          {/* Form Input */}
           <TextInput
-            value={stateAPBDes.create.form.name}
-            onChange={(val) => {
-              stateAPBDes.create.form.name = val.target.value;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Judul</Text>}
-            placeholder='Masukkan judul'
+            label="Nama APBDes"
+            placeholder="Masukkan nama APBDes"
+            value={stateAPBDes.create.form.name || ''}
+            onChange={(e) => (stateAPBDes.create.form.name = e.target.value)}
+            required
           />
-           <TextInput
-            value={stateAPBDes.create.form.jumlah}
-            onChange={(val) => {
-              stateAPBDes.create.form.jumlah = val.target.value;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Jumlah</Text>}
-            placeholder='Masukkan jumlah'
+          <TextInput
+            label="Jumlah Anggaran"
+            placeholder="Masukkan jumlah anggaran"
+            value={stateAPBDes.create.form.jumlah || ''}
+            onChange={(e) => (stateAPBDes.create.form.jumlah = e.target.value)}
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right" mt="md">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+              disabled={!imageFile || !docFile || !stateAPBDes.create.form.name || !stateAPBDes.create.form.jumlah}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>
diff --git a/src/app/admin/(dashboard)/landing-page/apbdes/page.tsx b/src/app/admin/(dashboard)/landing-page/apbdes/page.tsx
index 977bd6f0..ba56ba07 100644
--- a/src/app/admin/(dashboard)/landing-page/apbdes/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/apbdes/page.tsx
@@ -1,13 +1,12 @@
 'use client'
 import colors from '@/con/colors';
-import { ActionIcon, Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconDeviceImacCog, IconFile, IconSearch } from '@tabler/icons-react';
+import { IconDeviceImacCog, IconFile, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../_com/header';
-import JudulList from '../../_com/judulList';
 import apbdes from '../../_state/landing-page/apbdes';
 
 
@@ -17,7 +16,7 @@ function APBDes() {
     <Box>
       <HeaderSearch
         title='APBDes'
-        placeholder='pencarian'
+        placeholder='Cari APBDes...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -48,73 +47,102 @@ function ListAPBDes({ search }: { search: string }) {
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <JudulList
-            title='List APBDes'
-            href='/admin/landing-page/APBDes/create'
-          />
-          <Box style={{ overflowX: 'auto' }}>
-            <Table striped withRowBorders withTableBorder style={{ minWidth: '700px' }}>
-              <TableThead>
-                <TableTr>
-                  <TableTh>Nama APBDes</TableTh>
-                  <TableTh>Jumlah APBDes</TableTh>
-                  <TableTh>Document</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item) => (
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar APBDes</Title>
+          <Tooltip label="Tambah APBDes" withArrow>
+            <Button 
+              leftSection={<IconPlus size={18} />} 
+              color="blue" 
+              variant="light" 
+              onClick={() => router.push('/admin/landing-page/APBDes/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+        
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '30%' }}>Nama APBDes</TableTh>
+                <TableTh style={{ width: '25%' }}>Jumlah</TableTh>
+                <TableTh style={{ width: '25%' }}>Dokumen</TableTh>
+                <TableTh style={{ width: '20%' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
                   <TableTr key={item.id}>
                     <TableTd>
-                      <Box w={100}>
-                        <Text truncate="end" fz={"sm"}>{item.name}</Text>
-                      </Box>
+                      <Text fw={500} truncate="end">{item.name}</Text>
                     </TableTd>
                     <TableTd>
-                      <Text truncate="end" fz={"sm"}>Rp. {item.jumlah}</Text>
+                      <Text>Rp. {item.jumlah}</Text>
                     </TableTd>
                     <TableTd>
                       {item.file?.link ? (
-                        <ActionIcon
+                        <Button
                           component="a"
                           href={item.file.link}
                           target="_blank"
                           rel="noopener noreferrer"
-                          variant='transparent'
+                          variant="light"
+                          leftSection={<IconFile size={18} />}
+                          size="sm"
                         >
-                          <IconFile size={25} color={colors['blue-button']} />
-                        </ActionIcon>
+                          Lihat Dokumen
+                        </Button>
                       ) : (
-                        <Text>Tidak ada dokumen tersedia</Text>
+                        <Text c="dimmed" fz="sm">Tidak ada dokumen</Text>
                       )}
                     </TableTd>
                     <TableTd>
-                      <Button onClick={() => router.push(`/admin/landing-page/APBDes/${item.id}`)}>
-                        <IconDeviceImacCog size={25} />
+                      <Button
+                        variant="light"
+                        color="blue"
+                        onClick={() => router.push(`/admin/landing-page/APBDes/${item.id}`)}
+                        fullWidth
+                      >
+                        <IconDeviceImacCog size={20} />
+                        <Text ml={5}>Detail</Text>
                       </Button>
                     </TableTd>
                   </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data APBDes yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
-      <Center>
+      
+      <Center mt="md">
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)}
+          onChange={(newPage) => {
+            load(newPage, 10);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
           total={totalPages}
-          my={"md"}
+          color="blue"
+          radius="md"
         />
       </Center>
     </Box>
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/_lib/layouTabs.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/_lib/layouTabs.tsx
index e791300b..2f1e92b5 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/_lib/layouTabs.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/_lib/layouTabs.tsx
@@ -65,7 +65,7 @@ function LayoutTabs({ children }: { children: React.ReactNode }) {
                     }}
                 >
                     {tabs.map((tab, i) => (
-                        <Tooltip key={i} label={tab.tooltip} position="bottom" withArrow>
+                        <Tooltip key={i} label={tab.tooltip} position="bottom" withArrow transitionProps={{ transition: 'pop', duration: 200 }}>
                             <TabsTab
                                 value={tab.value}
                                 leftSection={tab.icon}
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/[id]/page.tsx
index 6af802dc..5e22c5fe 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/[id]/page.tsx
@@ -74,7 +74,7 @@ export default function EditKategoriDesaAntiKorupsi() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya"  withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/create/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/create/page.tsx
index d9533626..2ecb3429 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/create/page.tsx
@@ -35,7 +35,7 @@ export default function CreateKategoriDesaAntiKorupsi() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya"  withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/page.tsx
index b3d34da8..97c20c8b 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/page.tsx
@@ -99,7 +99,7 @@ function ListKategoriKegiatan({ search }: { search: string }) {
                       <Tooltip label="Edit" withArrow>
                         <Button
                           variant="light"
-                          color="blue"
+                          color="green"
                           size="sm"
                           onClick={() => router.push(`/admin/landing-page/desa-anti-korupsi/kategori-desa-anti-korupsi/${item.id}`)}
                         >
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/edit/page.tsx
index 6441c0d8..b6b87b41 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/edit/page.tsx
@@ -117,7 +117,7 @@ export default function EditDesaAntiKorupsi() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/page.tsx
index fe78632b..d72d0ac3 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/[id]/page.tsx
@@ -58,6 +58,7 @@ export default function DetailKegiatanDesa() {
         p="lg"
         radius="md"
         shadow="sm"
+        withBorder
       >
         <Stack gap="md">
           <Text fz="2xl" fw="bold" c={colors['blue-button']}>
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create/page.tsx
index d4e62858..ae196e20 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create/page.tsx
@@ -87,7 +87,7 @@ export default function CreateDesaAntiKorupsi() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/page.tsx b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/page.tsx
index e8ecc963..b41d154d 100644
--- a/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/page.tsx
@@ -1,5 +1,5 @@
 'use client'
-import colors from '@/con/colors';
+
 import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
@@ -14,9 +14,9 @@ function DesaAntiKorupsi() {
   return (
     <Box>
       <HeaderSearch
-        title='List Desa Anti Korupsi'
-        placeholder='Cari nama program atau kategori...'
-        searchIcon={<IconSearch size={20} />}
+        title="Program Desa Anti Korupsi"
+        placeholder="Cari nama program atau kategori..."
+        searchIcon={<IconSearch size={18} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
       />
@@ -28,14 +28,7 @@ function DesaAntiKorupsi() {
 function ListDesaAntiKorupsi({ search }: { search: string }) {
   const router = useRouter();
   const listState = useProxy(korupsiState.desaAntikorupsi);
-
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = listState.findMany;
+  const { data, page, totalPages, loading, load } = listState.findMany;
 
   useShallowEffect(() => {
     load(page, 10, search);
@@ -45,90 +38,117 @@ function ListDesaAntiKorupsi({ search }: { search: string }) {
 
   if (loading || !data) {
     return (
-      <Stack py={10}>
-        <Skeleton height={600} radius="md" />
+      <Stack py="md">
+        <Skeleton height={650} radius="lg" />
       </Stack>
     );
   }
 
+  if (data.length === 0) {
+    return (
+      <Box py="md">
+        <Paper p="lg" radius="lg" shadow="md" withBorder>
+          <Stack align="center" gap="sm">
+            <Title order={4}>Data Program Desa Anti Korupsi</Title>
+            <Text c="dimmed" ta="center">
+              Belum ada data program yang tersedia
+            </Text>
+          </Stack>
+        </Paper>
+      </Box>
+    );
+  }
+
   return (
-    <Box py={10}>
-      <Paper bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
-        <Group justify="space-between" mb="md">
-          <Title order={4}>Daftar Program Desa Anti Korupsi</Title>
-          <Tooltip label="Tambah Program Desa Anti Korupsi" withArrow>
-          <Button
-            leftSection={<IconPlus size={18} />}
-            color="blue"
-            variant="light"
-            onClick={() => router.push('/admin/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create')}
+    <Box>
+      <Stack gap="md">
+        <Paper p="lg" radius="lg" shadow="md" withBorder>
+          <Group justify="space-between" mb="md">
+            <Title order={4}>Daftar Program Desa Anti Korupsi</Title>
+            <Tooltip label="Tambah Program Baru" withArrow>
+              <Button
+                leftSection={<IconPlus size={18} />}
+                color="blue"
+                onClick={() => router.push('/admin/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create')}
+              >
+                Tambah Baru
+              </Button>
+            </Tooltip>
+          </Group>
+
+          <Table
+            striped
+            highlightOnHover
+            
+            withRowBorders
+            verticalSpacing="sm"
           >
-            Tambah Baru
-          </Button>
-          </Tooltip>
-        </Group>
-        <Box style={{ overflowX: "auto" }}>
-          <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh>Nama Program</TableTh>
-                <TableTh>Kategori</TableTh>
-                <TableTh>Aksi</TableTh>
+                <TableTh style={{ width: '50%' }}>Nama Program</TableTh>
+                <TableTh style={{ width: '30%' }}>Kategori</TableTh>
+                <TableTh style={{ width: '20%', textAlign: 'center' }}>Aksi</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
               {filteredData.length > 0 ? (
                 filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd>
-                      <Box w={350}>
-                        <Text lineClamp={1} fw={500}>{item.name || '-'}</Text>
-                      </Box>
+                    <TableTd style={{ width: '50%' }}>
+                      <Text fw={500} lineClamp={1}>
+                        {item.name || '-'}
+                      </Text>
                     </TableTd>
-                    <TableTd>
+                    <TableTd style={{ width: '30%' }}>
                       <Text fz="sm" c="dimmed">
                         {item.kategori?.name || '-'}
                       </Text>
                     </TableTd>
-                    <TableTd>
+                    <TableTd style={{ width: '20%', textAlign: 'center' }}>
                       <Button
+                        size="xs"
+                        radius="md"
                         variant="light"
                         color="blue"
-                        onClick={() => router.push(`/admin/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/${item.id}`)}
+                        leftSection={<IconDeviceImacCog size={16} />}
+                        onClick={() =>
+                          router.push(
+                            `/admin/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/${item.id}`
+                          )
+                        }
                       >
-                        <IconDeviceImacCog size={20} />
-                        <Text ml={5}>Detail</Text>
+                        Detail
                       </Button>
                     </TableTd>
                   </TableTr>
                 ))
               ) : (
                 <TableTr>
-                  <TableTd colSpan={4}>
-                    <Center py={20}>
-                      <Text c="dimmed">Tidak ada data program yang cocok</Text>
-                    </Center>
+                  <TableTd colSpan={3}>
+                    <Text ta="center" c="dimmed">
+                      Tidak ditemukan data dengan kata kunci pencarian
+                    </Text>
                   </TableTd>
                 </TableTr>
               )}
             </TableTbody>
           </Table>
-        </Box>
-      </Paper>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => {
-            load(newPage, 10);
-            window.scrollTo({ top: 0, behavior: 'smooth' });
-          }}
-          total={totalPages}
-          mt="md"
-          mb="md"
-          color="blue"
-          radius="md"
-        />
-      </Center>
+        </Paper>
+
+        <Center>
+          <Pagination
+            value={page}
+            total={totalPages}
+            onChange={(newPage) => {
+              load(newPage, 10, search);
+              window.scrollTo({ top: 0, behavior: 'smooth' });
+            }}
+            size="md"
+            radius="md"
+            mt="md"
+          />
+        </Center>
+      </Stack>
     </Box>
   );
 }
diff --git a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/_lib/layoutTab.tsx b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/_lib/layoutTab.tsx
index 3aed1230..ff2dc955 100644
--- a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/_lib/layoutTab.tsx
+++ b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/_lib/layoutTab.tsx
@@ -1,63 +1,89 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
+import { IconChartBar, IconUsers } from '@tabler/icons-react';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
 
 function LayoutTabsKepuasan({ children }: { children: React.ReactNode }) {
-    const router = useRouter()
-    const pathname = usePathname()
-    const tabs = [
-        {
-            label: "Grafik Kepuasan Masyarakat",
-            value: "grafikkepuasannamasyarakat",
-            href: "/admin/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat"
-        },
-        {
-            label: "Responden",
-            value: "responden",
-            href: "/admin/landing-page/indeks-kepuasan-masyarakat/responden"
-        },
-        
-    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+  const router = useRouter();
+  const pathname = usePathname();
+  const tabs = [
+    {
+      label: "Grafik Kepuasan",
+      description: "Lihat visualisasi grafik kepuasan masyarakat",
+      value: "grafik",
+      href: "/admin/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat",
+      icon: <IconChartBar size={18} stroke={1.8} />
+    },
+    {
+      label: "Responden",
+      description: "Kelola dan tinjau data responden",
+      value: "responden",
+      href: "/admin/landing-page/indeks-kepuasan-masyarakat/responden",
+      icon: <IconUsers size={18} stroke={1.8} />
+    },
+  ];
 
-    const handleTabChange = (value: string | null) => {
-        const tab = tabs.find(t => t.value === value)
-        if (tab) {
-            router.push(tab.href)
-        }
-        setActiveTab(value)
-    }
+  const curentTab = tabs.find(tab => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
 
-    useEffect(() => {
-        const match = tabs.find(tab => tab.href === pathname)
-        if (match) {
-            setActiveTab(match.value)
-        }
-    }, [pathname])
+  const handleTabChange = (value: string | null) => {
+    const tab = tabs.find(t => t.value === value);
+    if (tab) router.push(tab.href);
+    setActiveTab(value);
+  };
 
-    return (
-        <Stack>
-            <Title order={3}>Indeks Kepuasan Masyarakat</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
-                    </TabsPanel>
-                ))}
-            </Tabs>
-            {children}
-        </Stack>
-    );
+  useEffect(() => {
+    const match = tabs.find(tab => tab.href === pathname);
+    if (match) setActiveTab(match.value);
+  }, [pathname]);
+
+  return (
+    <Stack gap="lg">
+      <Title order={2} style={{ fontWeight: 700, color: "#1a1a1a" }}>
+        Indeks Kepuasan Masyarakat
+      </Title>
+      <Tabs
+        radius="xl"
+        color="blue"
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+      >
+        <TabsList
+          p="sm"
+          style={{
+            background: "#F3F4FB",
+            borderRadius: "1rem",
+            
+          }}
+        >
+          {tabs.map((e, i) => (
+            <Tooltip key={i} label={e.description} withArrow position="bottom" transitionProps={{ transition: 'pop', duration: 200 }}>
+              <TabsTab
+                value={e.value}
+                leftSection={e.icon}
+                style={{
+                  fontWeight: 500,
+                  fontSize: "0.9rem",
+                  transition: "all 0.2s ease",
+                }}
+              >
+                {e.label}
+              </TabsTab>
+            </Tooltip>
+          ))}
+        </TabsList>
+        {tabs.map((e, i) => (
+          <TabsPanel key={i} value={e.value} mt="md">
+            <></>
+          </TabsPanel>
+        ))}
+      </Tabs>
+      {children}
+    </Stack>
+  );
 }
 
-export default LayoutTabsKepuasan;
\ No newline at end of file
+export default LayoutTabsKepuasan;
diff --git a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat/page.tsx b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat/page.tsx
index 6bb6d463..1bb400bf 100644
--- a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat/page.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 'use client';
 import colors from '@/con/colors';
-import { PieChart, BarChart } from '@mantine/charts'; // ✅ Ganti recharts dengan Mantine
+import { PieChart, BarChart } from '@mantine/charts';
 import {
   Box,
   Center,
@@ -22,11 +22,8 @@ interface ChartDataItem {
   name: string;
   value: number;
   color: string;
-  label?: string;
 }
 
-
-
 function Page() {
   const state = useProxy(indeksKepuasanState.responden);
   const { data, loading } = state.findMany;
@@ -41,28 +38,23 @@ function Page() {
       return;
     }
     if (data) {
-      // Hitung total berdasarkan jenis kelamin
       const totalLaki = data.filter((item: any) => item.jenisKelamin?.name?.toLowerCase() === 'laki-laki').length;
       const totalPerempuan = data.filter((item: any) => item.jenisKelamin?.name?.toLowerCase() === 'perempuan').length;
 
-      // Hitung total berdasarkan rating
       const totalSangatBaik = data.filter((item: any) => item.rating?.name?.toLowerCase() === 'sangat baik').length;
       const totalBaik = data.filter((item: any) => item.rating?.name?.toLowerCase() === 'baik').length;
       const totalKurangBaik = data.filter((item: any) => item.rating?.name?.toLowerCase() === 'kurang baik').length;
       const totalSangatKurangBaik = data.filter((item: any) => item.rating?.name?.toLowerCase() === 'sangat kurang baik').length;
 
-      // Hitung total berdasarkan kelompok umur
       const totalMuda = data.filter((item: any) => item.kelompokUmur?.name?.toLowerCase() === 'muda').length;
       const totalDewasa = data.filter((item: any) => item.kelompokUmur?.name?.toLowerCase() === 'dewasa').length;
       const totalLansia = data.filter((item: any) => item.kelompokUmur?.name?.toLowerCase() === 'lansia').length;
 
-      // Update gender chart data
       setDonutDataJenisKelamin([
         { name: 'Laki-laki', value: totalLaki, color: colors['blue-button'] },
         { name: 'Perempuan', value: totalPerempuan, color: '#10A85AFF' },
       ]);
 
-      // Update rating chart data
       setDonutDataRating([
         { name: 'Sangat Baik', value: totalSangatBaik, color: colors['blue-button'] },
         { name: 'Baik', value: totalBaik, color: '#10A85AFF' },
@@ -70,18 +62,15 @@ function Page() {
         { name: 'Sangat Kurang Baik', value: totalSangatKurangBaik, color: '#FF4500' },
       ]);
 
-      // Update age group chart data
       setDonutDataKelompokUmur([
         { name: 'Muda', value: totalMuda, color: colors['blue-button'] },
         { name: 'Dewasa', value: totalDewasa, color: '#10A85AFF' },
         { name: 'Lansia', value: totalLansia, color: '#FFA500' },
       ]);
 
-      // Process data for bar chart (group by month)
       const monthYearMap = new Map<string, number>();
 
       data.forEach((item: any) => {
-        // Try both createdAt and tanggal fields
         const dateValue = item.tanggal || item.createdAt;
         if (!dateValue) return;
 
@@ -95,7 +84,6 @@ function Page() {
         monthYearMap.set(monthYearKey, (monthYearMap.get(monthYearKey) || 0) + 1);
       });
 
-      // Convert map to array and sort by date
       const barData = Array.from(monthYearMap.entries())
         .map(([key, count]) => {
           const [year, month] = key.split('-');
@@ -104,7 +92,7 @@ function Page() {
           return {
             month: `${monthName} ${year}`,
             count,
-            sortKey: parseInt(`${year}${String(month).padStart(2, '0')}`, 10)
+            sortKey: parseInt(`${year}${String(month).padStart(2, '0')}`, 10),
           };
         })
         .sort((a, b) => a.sortKey - b.sortKey)
@@ -116,28 +104,27 @@ function Page() {
 
   if (loading || !data) {
     return (
-      <Stack py={10}>
-        <Skeleton height={730} />
+      <Stack py="xl">
+        <Skeleton height={750} radius="lg" />
       </Stack>
     );
   }
 
   if (data.length === 0) {
     return (
-      <Stack py={10}>
-        <Text c="dimmed" ta="center" my="md">
-          Belum ada data untuk ditampilkan
+      <Stack py="xl">
+        <Text c="dimmed" ta="center" size="lg">
+          Belum ada data yang tersedia
         </Text>
       </Stack>
     );
   }
 
   return (
-    <Stack gap="xs">
-      {/* Bar Chart - Data per Tanggal */}
-      <Paper bg={colors['white-1']} p="md" radius="md" mb="md">
-        <Title order={4} mb="md" ta="center">Jumlah Responden per Bulan</Title>
-        <Box h={300}>
+    <Stack gap="lg">
+      <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
+        <Title order={3} mb="md" ta="center">Tren Jumlah Responden</Title>
+        <Box h={320}>
           <BarChart
             h={300}
             data={barChartData}
@@ -152,14 +139,13 @@ function Page() {
         </Box>
       </Paper>
 
-      <SimpleGrid cols={{ base: 1, md: 3 }}>
-        {/* Chart Jenis Kelamin */}
-        <Paper bg={colors['white-1']} p="md" radius="md">
+      <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+        <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
           <Stack>
-            <Title order={4}>Jenis Kelamin</Title>
+            <Title order={4} ta="center">Distribusi Jenis Kelamin</Title>
             {donutDataJenisKelamin.every(item => item.value === 0) ? (
               <Text c="dimmed" ta="center" my="md">
-                Belum ada data untuk ditampilkan dalam grafik
+                Tidak ada data
               </Text>
             ) : (
               <Box>
@@ -168,15 +154,15 @@ function Page() {
                     withLabels
                     withTooltip
                     labelsType="percent"
-                    size={250}
+                    size={220}
                     data={donutDataJenisKelamin}
                   />
                 </Center>
-                <Stack gap="sm" mt="md">
+                <Stack gap="xs" mt="md">
                   {donutDataJenisKelamin.map((entry) => (
-                    <Flex key={entry.name} gap="md" align="center">
-                      <Box bg={entry.color} w={20} h={20} style={{ flexShrink: 0 }} />
-                      <Text size="sm">{entry.name}: {entry.value}</Text>
+                    <Flex key={entry.name} gap="sm" align="center">
+                      <Box bg={entry.color} w={14} h={14} style={{ borderRadius: 4, flexShrink: 0 }} />
+                      <Text size="sm" fw={500}>{entry.name}: {entry.value}</Text>
                     </Flex>
                   ))}
                 </Stack>
@@ -185,13 +171,12 @@ function Page() {
           </Stack>
         </Paper>
 
-        {/* Chart Rating */}
-        <Paper bg={colors['white-1']} p="md" radius="md">
+        <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
           <Stack>
-            <Title order={4}>Pilihan</Title>
+            <Title order={4} ta="center">Distribusi Penilaian</Title>
             {donutDataRating.every(item => item.value === 0) ? (
               <Text c="dimmed" ta="center" my="md">
-                Belum ada data untuk ditampilkan dalam grafik
+                Tidak ada data
               </Text>
             ) : (
               <Box>
@@ -200,15 +185,15 @@ function Page() {
                     withLabels
                     withTooltip
                     labelsType="percent"
-                    size={250}
+                    size={220}
                     data={donutDataRating}
                   />
                 </Center>
-                <Stack gap="sm" mt="md">
+                <Stack gap="xs" mt="md">
                   {donutDataRating.map((entry) => (
-                    <Flex key={entry.name} gap="md" align="center">
-                      <Box bg={entry.color} w={20} h={20} style={{ flexShrink: 0 }} />
-                      <Text size="sm">{entry.name}: {entry.value}</Text>
+                    <Flex key={entry.name} gap="sm" align="center">
+                      <Box bg={entry.color} w={14} h={14} style={{ borderRadius: 4, flexShrink: 0 }} />
+                      <Text size="sm" fw={500}>{entry.name}: {entry.value}</Text>
                     </Flex>
                   ))}
                 </Stack>
@@ -217,13 +202,12 @@ function Page() {
           </Stack>
         </Paper>
 
-        {/* Chart Kelompok Umur */}
-        <Paper bg={colors['white-1']} p="md" radius="md">
+        <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
           <Stack>
-            <Title order={4}>Umur</Title>
+            <Title order={4} ta="center">Distribusi Kelompok Umur</Title>
             {donutDataKelompokUmur.every(item => item.value === 0) ? (
               <Text c="dimmed" ta="center" my="md">
-                Belum ada data untuk ditampilkan dalam grafik
+                Tidak ada data
               </Text>
             ) : (
               <Box>
@@ -232,15 +216,15 @@ function Page() {
                     withLabels
                     withTooltip
                     labelsType="percent"
-                    size={250}
+                    size={220}
                     data={donutDataKelompokUmur}
                   />
                 </Center>
-                <Stack gap="sm" mt="md">
+                <Stack gap="xs" mt="md">
                   {donutDataKelompokUmur.map((entry) => (
-                    <Flex key={entry.name} gap="md" align="center">
-                      <Box bg={entry.color} w={20} h={20} style={{ flexShrink: 0 }} />
-                      <Text size="sm">{entry.name}: {entry.value}</Text>
+                    <Flex key={entry.name} gap="sm" align="center">
+                      <Box bg={entry.color} w={14} h={14} style={{ borderRadius: 4, flexShrink: 0 }} />
+                      <Text size="sm" fw={500}>{entry.name}: {entry.value}</Text>
                     </Flex>
                   ))}
                 </Stack>
@@ -253,4 +237,4 @@ function Page() {
   );
 }
 
-export default Page;
\ No newline at end of file
+export default Page;
diff --git a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/edit/page.tsx
index 7d9f6e55..58e82afc 100644
--- a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/edit/page.tsx
@@ -4,8 +4,8 @@ import React, { useEffect, useState } from 'react';
 import { useRouter, useParams } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Title, TextInput, Text, Select } from '@mantine/core';
-import { IconArrowBack } from '@tabler/icons-react';
+import { Box, Button, Group, Paper, Stack, Title, TextInput, Text, Select, Tooltip } from '@mantine/core';
+import { IconArrowBack, IconDeviceFloppy } from '@tabler/icons-react';
 import indeksKepuasanState from '@/app/admin/(dashboard)/_state/landing-page/indeks-kepuasan';
 import { toast } from 'react-toastify';
 
@@ -74,23 +74,39 @@ function EditResponden() {
     state.update.id = id;
     state.update.form = { ...formData }; // <-- sinkronisasi manual
     await state.update.submit();
-    router.push('/admin/ppid/ikm-desa-darmasaba/responden')
+    router.push('/admin/landing-page/indeks-kepuasan-masyarakat/responden')
   }
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack size={20} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
-        <Stack>
-          <Title order={3}>Edit Responden</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Responden
+        </Title>
+      </Group>
+
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
           <TextInput
-            label="Nama"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Nama Responden
+              </Text>
+            }
             type='text'
-            placeholder="masukkan nama"
+            placeholder="Masukkan nama responden"
             value={formData.name}
             onChange={(val) => {
               setFormData({
@@ -98,9 +114,15 @@ function EditResponden() {
                 name: val.currentTarget.value
               })
             }}
+            radius="md"
+            required
           />
           <TextInput
-            label="Tanggal"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Tanggal
+              </Text>
+            }
             type="date"
             placeholder='Pilih tanggal'
             value={formData.tanggal ? new Date(formData.tanggal).toISOString().split('T')[0] : ''}
@@ -111,32 +133,43 @@ function EditResponden() {
                 tanggal: selectedDate,
               });
             }}
+            radius="md"
+            required
           />
           <Select
-            key={"jenisKelamin"}
-            label={<Text fw="bold" fz="sm">Jenis Kelamin</Text>}
+            key="jenisKelamin"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Jenis Kelamin
+              </Text>
+            }
             placeholder="Pilih jenis kelamin"
             value={formData.jenisKelaminId}
             onChange={(val) => setFormData({ ...formData, jenisKelaminId: val || "" })}
             data={
               (indeksKepuasanState.jenisKelaminResponden.findMany.data || [])
-                .filter(Boolean) // Hapus null/undefined
+                .filter(Boolean)
                 .map((v) => ({
                   value: v.id || '',
                   label: typeof v.name === 'string' ? v.name : 'Tanpa Nama'
                 }))
             }
-            disabled={indeksKepuasanState.jenisKelaminResponden.findMany.loading} // ✅ disable saat loading
+            disabled={indeksKepuasanState.jenisKelaminResponden.findMany.loading}
             clearable
             searchable
             required
+            radius="md"
             error={!formData.jenisKelaminId ? "Pilih jenis kelamin" : undefined}
           />
           <Select
-            key={"rating"}
+            key="rating"
             value={formData.ratingId}
             onChange={(val) => setFormData({ ...formData, ratingId: val || "" })}
-            label={<Text fw={"bold"} fz={"sm"}>Rating</Text>}
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Rating
+              </Text>
+            }
             placeholder='Pilih rating'
             data={
               (indeksKepuasanState.pilihanRatingResponden.findMany.data || [])
@@ -150,6 +183,7 @@ function EditResponden() {
             clearable
             searchable
             required
+            radius="md"
             error={!formData.ratingId ? "Pilih rating" : undefined}
           />
 
@@ -173,14 +207,24 @@ function EditResponden() {
             required
             error={!formData.kelompokUmurId ? "Pilih kelompok umur" : undefined}
           />
-
-          <Button
-            mt={10}
-            bg={colors['blue-button']}
-            onClick={handleSubmit}
-          >
-            Submit
-          </Button>
+          
+          <Group justify="flex-end" mt="md">
+            <Button 
+              variant="light" 
+              color="red" 
+              onClick={() => router.back()}
+            >
+              Batal
+            </Button>
+            <Button 
+              leftSection={<IconDeviceFloppy size={20} />}
+              onClick={handleSubmit} 
+              loading={state.update.loading}
+              color={colors['blue-button']}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/page.tsx
index 08849a58..e82733d0 100644
--- a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/[id]/page.tsx
@@ -3,10 +3,10 @@
 import { ModalKonfirmasiHapus } from "@/app/admin/(dashboard)/_com/modalKonfirmasiHapus"
 import indeksKepuasanState from "@/app/admin/(dashboard)/_state/landing-page/indeks-kepuasan"
 import colors from "@/con/colors"
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from "@mantine/core"
+import { Box, Button, Group, Paper, Skeleton, Stack, Text, Tooltip } from "@mantine/core"
 import { useShallowEffect } from "@mantine/hooks"
-import { IconArrowBack, IconEdit, IconX } from "@tabler/icons-react"
-import { useRouter, useParams } from "next/navigation"
+import { IconArrowBack, IconEdit, IconTrash } from "@tabler/icons-react"
+import { useParams, useRouter } from "next/navigation"
 import { useState } from "react"
 import { useProxy } from "valtio/utils"
 
@@ -38,67 +38,89 @@ export default function DetailResponden() {
     )
   }
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper w={{ base: "100%", md: "50%" }} bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Responden</Text>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
 
-          <Paper bg={colors['BG-trans']} p={'md'}>
-            <Stack gap={"xs"}>
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "60%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Responden
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Nama Responden</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.name}</Text>
+                <Text fz="lg" fw="bold">Nama Responden</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.name || '-'}</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Tanggal</Text>
-                <Text fz={"lg"}>{
+                <Text fz="lg" fw="bold">Tanggal</Text>
+                <Text fz="md" c="dimmed">{
                   stateDetail.findUnique.data?.tanggal
                     ? new Date(stateDetail.findUnique.data.tanggal).toLocaleDateString('id-ID')
                     : '-'
                 }</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Jenis Kelamin</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.jenisKelamin?.name}</Text>
+                <Text fz="lg" fw="bold">Jenis Kelamin</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.jenisKelamin?.name || '-'}</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Rating</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.rating?.name}</Text>
+                <Text fz="lg" fw="bold">Rating</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.rating?.name || '-'}</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Kelompok Umur</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.kelompokUmur?.name}</Text>
+                <Text fz="lg" fw="bold">Kelompok Umur</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.kelompokUmur?.name || '-'}</Text>
               </Box>
-              <Flex gap={"xs"} mt={10}>
-                <Button
-                  onClick={() => {
-                    if (stateDetail.findUnique.data) {
-                      setSelectedId(stateDetail.findUnique.data.id);
-                      setModalHapus(true);
-                    }
-                  }}
-                  disabled={stateDetail.delete.loading || !stateDetail.findUnique.data}
-                  color={"red"}
-                >
-                  <IconX size={20} />
-                </Button>
-                <Button
-                  onClick={() => {
-                    if (stateDetail.findUnique.data) {
-                      router.push(`/admin/ppid/ikm-desa-darmasaba/responden/${stateDetail.findUnique.data.id}/edit`);
-                    }
-                  }}
-                  disabled={!stateDetail.findUnique.data}
-                  color={"green"}
-                >
-                  <IconEdit size={20} />
-                </Button>
-              </Flex>
+              
+              <Group gap="sm" mt="md">
+                <Tooltip label="Hapus Responden" withArrow position="top">
+                  <Button
+                    color="red"
+                    variant="light"
+                    onClick={() => {
+                      if (stateDetail.findUnique.data) {
+                        setSelectedId(stateDetail.findUnique.data.id);
+                        setModalHapus(true);
+                      }
+                    }}
+                    disabled={stateDetail.delete.loading || !stateDetail.findUnique.data}
+                    leftSection={<IconTrash size={20} />}
+                  >
+                    Hapus
+                  </Button>
+                </Tooltip>
+                <Tooltip label="Edit Responden" withArrow position="top">
+                  <Button
+                    color="green"
+                    variant="light"
+                    onClick={() => {
+                      if (stateDetail.findUnique.data) {
+                        router.push(`/admin/landing-page/indeks-kepuasan-masyarakat/responden/${stateDetail.findUnique.data.id}/edit`);
+                      }
+                    }}
+                    disabled={!stateDetail.findUnique.data}
+                    leftSection={<IconEdit size={20} />}
+                  >
+                    Edit
+                  </Button>
+                </Tooltip>
+              </Group>
             </Stack>
           </Paper>
         </Stack>
diff --git a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/page.tsx b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/page.tsx
index 511b05fd..6cfb3f2a 100644
--- a/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/indeks-kepuasan-masyarakat/responden/page.tsx
@@ -1,22 +1,37 @@
 'use client';
-import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
-import { useShallowEffect } from '@mantine/hooks';
-import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
-import { useRouter } from 'next/navigation';
 import { useState } from 'react';
+import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
+import { useShallowEffect } from '@mantine/hooks';
+import {
+  Box,
+  Button,
+  Center,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+} from '@mantine/core';
+import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
 import HeaderSearch from '../../../_com/header';
 import indeksKepuasanState from '../../../_state/landing-page/indeks-kepuasan';
 
 function Responden() {
-  const [search, setSearch] = useState("");
+  const [search, setSearch] = useState('');
   return (
     <Box>
       <HeaderSearch
-        title='Responden'
-        placeholder='pencarian'
-        searchIcon={<IconSearch size={20} />}
+        title="Data Responden"
+        placeholder="Cari nama responden..."
+        searchIcon={<IconSearch size={18} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
       />
@@ -34,84 +49,99 @@ function ListResponden({ search }: ListRespondenProps) {
   const router = useRouter();
   const { data, page, totalPages, loading, load } = state.findMany;
 
-
   useShallowEffect(() => {
-    load(page, 10)
+    load(page, 10);
   }, [page]);
 
-
-  const filteredData = (data || []).filter(item => {
+  const filteredData = (data || []).filter((item) => {
     const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword)
-    );
+    return item.name.toLowerCase().includes(keyword);
   });
 
   if (loading || !data) {
     return (
-      <Stack py={10}>
-        <Skeleton height={730} />
+      <Stack py="md">
+        <Skeleton height={650} radius="lg" />
       </Stack>
     );
   }
+
   if (data.length === 0) {
     return (
-      <Box py={10}>
-        <Paper p="md">
-          <Stack>
-            <Title>Responden</Title>
-            <Table striped withTableBorder withRowBorders>
-              <TableThead>
-                <TableTr>
-                  <TableTh>No</TableTh>
-                  <TableTh>Nama</TableTh>
-                  <TableTh>Tanggal</TableTh>
-                  <TableTh>Jenis Kelamin</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-            </Table>
-            <Text ta="center">Tidak ada data berdasarkan jenis kelamin responden yang tersedia</Text>
+      <Box py="md">
+        <Paper p="lg" radius="lg" shadow="md" withBorder>
+          <Stack align="center" gap="sm">
+            <Title order={4}>Data Responden</Title>
+            <Text c="dimmed" ta="center">
+              Belum ada data responden yang tersedia
+            </Text>
           </Stack>
         </Paper>
-      </Box >
+      </Box>
     );
   }
 
   return (
     <Box>
-      <Stack gap="xs">
-        <Paper bg={colors['white-1']} p="md" h={{ base: 730, md: 650 }}>
-          <Title mb={10} order={3}>List Responden</Title>
-          <Table striped withTableBorder withRowBorders>
+      <Stack gap="md">
+        <Paper p="lg" radius="lg" shadow="md" withBorder>
+          <Title order={4} mb="sm">
+            Daftar Responden
+          </Title>
+          <Table
+            striped
+            highlightOnHover
+            withTableBorder
+            withRowBorders
+            verticalSpacing="sm"
+          >
             <TableThead>
               <TableTr>
                 <TableTh style={{ width: '5%', textAlign: 'center' }}>No</TableTh>
-                <TableTh style={{ width: '20%', textAlign: 'center' }}>Nama</TableTh>
+                <TableTh style={{ width: '25%', textAlign: 'center' }}>Nama</TableTh>
                 <TableTh style={{ width: '20%', textAlign: 'center' }}>Tanggal</TableTh>
                 <TableTh style={{ width: '20%', textAlign: 'center' }}>Jenis Kelamin</TableTh>
-                <TableTh style={{ width: '15%', textAlign: 'center' }}>Detail</TableTh>
+                <TableTh style={{ width: '15%', textAlign: 'center' }}>Aksi</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
               {filteredData.length === 0 ? (
                 <TableTr>
-                  <TableTd colSpan={6}>
-                    <Text ta='center' c='dimmed'>Belum ada data responden</Text>
+                  <TableTd colSpan={5}>
+                    <Text ta="center" c="dimmed">
+                      Tidak ditemukan data dengan kata kunci pencarian
+                    </Text>
                   </TableTd>
                 </TableTr>
               ) : (
                 filteredData.map((item, index) => (
                   <TableTr key={item.id}>
-                    <TableTd style={{ width: '5%', textAlign: 'center' }}>{index + 1}</TableTd>
-                    <TableTd style={{ width: '20%', textAlign: 'center' }}>{item.name}</TableTd>
-                    <TableTd style={{ width: '20%', textAlign: 'center' }}>{item.tanggal
-                      ? new Date(item.tanggal).toLocaleDateString('id-ID')
-                      : '-'}</TableTd>
-                    <TableTd style={{ width: '20%', textAlign: 'center' }}>{item.jenisKelamin.name}</TableTd>
-                    <TableTd style={{ width: '15%', textAlign: 'center' }}>
-                      <Button color='green' onClick={() => router.push(`/admin/ppid/ikm-desa-darmasaba/responden/${item.id}`)}>
-                        <IconDeviceImac size={20} />
+                    <TableTd ta="center">{index + 1}</TableTd>
+                    <TableTd ta="center">{item.name}</TableTd>
+                    <TableTd ta="center">
+                      {item.tanggal
+                        ? new Date(item.tanggal).toLocaleDateString('id-ID', {
+                            day: '2-digit',
+                            month: 'long',
+                            year: 'numeric',
+                          })
+                        : '-'}
+                    </TableTd>
+                    <TableTd ta="center">{item.jenisKelamin.name}</TableTd>
+                    <TableTd ta="center">
+                      <Button
+                        size="xs"
+                        radius="md"
+                        variant="light"
+                        color="blue"
+                        leftSection={<IconDeviceImac size={16} />}
+                        onClick={() =>
+                          router.push(
+                            `/admin/landing-page/indeks-kepuasan-masyarakat/responden/${item.id}`
+                          )
+                        }
+                      >
+                        Detail
                       </Button>
                     </TableTd>
                   </TableTr>
@@ -123,22 +153,19 @@ function ListResponden({ search }: ListRespondenProps) {
         <Center>
           <Pagination
             value={page}
+            total={totalPages}
             onChange={(newPage) => {
               load(newPage, 10);
-              window.scrollTo(0, 0);
+              window.scrollTo({ top: 0, behavior: 'smooth' });
             }}
-            total={totalPages}
+            size="md"
+            radius="md"
             mt="md"
-            mb="md"
           />
         </Center>
-
-       
       </Stack>
     </Box>
   );
 }
 
 export default Responden;
-
-
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/_lib/layoutTabs.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/_lib/layoutTabs.tsx
index 50d3a136..b77a4e45 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/_lib/layoutTabs.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/_lib/layoutTabs.tsx
@@ -1,62 +1,103 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
+import { IconCategory, IconListDetails } from '@tabler/icons-react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
-    const router = useRouter()
-    const pathname = usePathname()
-    const tabs = [
-        {
-            label: "List Prestasi Desa",
-            value: "listPrestasiDesa",
-            href: "/admin/landing-page/prestasi-desa/list-prestasi-desa"
-        },
-        {
-            label: "Kategori Prestasi Desa",
-            value: "kategoriPrestasiDesa",
-            href: "/admin/landing-page/prestasi-desa/kategori-prestasi-desa"
-        },
-    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+  const router = useRouter();
+  const pathname = usePathname();
 
-    const handleTabChange = (value: string | null) => {
-        const tab = tabs.find(t => t.value === value)
-        if (tab) {
-            router.push(tab.href)
-        }
-        setActiveTab(value)
+  const tabs = [
+    {
+      label: "Daftar Prestasi",
+      value: "listPrestasiDesa",
+      href: "/admin/landing-page/prestasi-desa/list-prestasi-desa",
+      icon: <IconListDetails size={18} stroke={1.8} />,
+      tooltip: "Kelola daftar prestasi desa",
+    },
+    {
+      label: "Kategori Prestasi",
+      value: "kategoriPrestasiDesa",
+      href: "/admin/landing-page/prestasi-desa/kategori-prestasi-desa",
+      icon: <IconCategory size={18} stroke={1.8} />,
+      tooltip: "Kelola kategori prestasi desa",
+    },
+  ];
+
+  const currentTab = tabs.find(tab => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(currentTab?.value || tabs[0].value);
+
+  const handleTabChange = (value: string | null) => {
+    const tab = tabs.find(t => t.value === value);
+    if (tab) {
+      router.push(tab.href);
     }
+    setActiveTab(value);
+  };
 
-    useEffect(() => {
-        const match = tabs.find(tab => tab.href === pathname)
-        if (match) {
-            setActiveTab(match.value)
-        }
-    }, [pathname])
+  useEffect(() => {
+    const match = tabs.find(tab => tab.href === pathname);
+    if (match) {
+      setActiveTab(match.value);
+    }
+  }, [pathname]);
 
-    return (
-        <Stack>
-            <Title order={3}>Prestasi Desa</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
-                    </TabsPanel>
-                ))}
-            </Tabs>
+  return (
+    <Stack gap="lg">
+      <Title order={2} fw={700} style={{ color: "#1A1B1E" }}>
+        Prestasi Desa
+      </Title>
+      <Tabs
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+        radius="lg"
+        keepMounted={false}
+      >
+        <TabsList
+          p="sm"
+          style={{
+            background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+            borderRadius: "1rem",
+            boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+          }}
+        >
+          {tabs.map((tab, i) => (
+            <Tooltip key={i} label={tab.tooltip} position="bottom" withArrow transitionProps={{ transition: 'pop', duration: 200 }}>
+              <TabsTab
+                value={tab.value}
+                leftSection={tab.icon}
+                style={{
+                  fontWeight: 600,
+                  fontSize: "0.9rem",
+                  transition: "all 0.2s ease",
+                }}
+              >
+                {tab.label}
+              </TabsTab>
+            </Tooltip>
+          ))}
+        </TabsList>
+
+        {tabs.map((tab, i) => (
+          <TabsPanel
+            key={i}
+            value={tab.value}
+            style={{
+              padding: "1.5rem",
+              background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+              borderRadius: "1rem",
+              boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+            }}
+          >
             {children}
-        </Stack>
-    );
+          </TabsPanel>
+        ))}
+      </Tabs>
+    </Stack>
+  );
 }
 
 export default LayoutTabs;
\ No newline at end of file
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/[id]/page.tsx
index dcd9ad2c..db646f03 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/[id]/page.tsx
@@ -2,7 +2,7 @@
 'use client'
 import prestasiState from '@/app/admin/(dashboard)/_state/landing-page/prestasi-desa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -45,7 +45,7 @@ function EditKategoriPrestasi() {
   const handleSubmit = async () => {
     try {
       if (!formData.name.trim()) {
-        toast.error('Nama kategori prestasi desa tidak boleh kosong');
+        toast.error('Nama kategori prestasi tidak boleh kosong');
         return;
       }
 
@@ -70,24 +70,48 @@ function EditKategoriPrestasi() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Kategori Prestasi
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Kategori Prestasi Desa</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label="Nama Kategori Prestasi"
+            placeholder="Masukkan nama kategori prestasi"
             value={formData.name}
             onChange={(e) => setFormData({ ...formData, name: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Kategori Prestasi Desa</Text>}
-            placeholder='Masukkan nama kategori prestasi desa'
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/create/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/create/page.tsx
index 3c95269b..da45b56b 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/create/page.tsx
@@ -2,7 +2,7 @@
 'use client'
 import prestasiState from '@/app/admin/(dashboard)/_state/landing-page/prestasi-desa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
@@ -30,31 +30,51 @@ function CreateKategoriPrestasi() {
   }
 
   return (
-    <Box>
-      <Box>
-        <Box mb={10}>
-          <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-            <IconArrowBack color={colors['blue-button']} size={25} />
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
-        </Box>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Kategori Prestasi
+        </Title>
+      </Group>
 
-        <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-          <Stack gap={"xs"}>
-            <Title order={4}>Create Kategori Prestasi Desa</Title>
-            <TextInput
-              value={stateKategori.create.form.name}
-              onChange={(val) => {
-                stateKategori.create.form.name = val.target.value;
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Kategori Prestasi"
+            placeholder="Masukkan nama kategori prestasi"
+            value={stateKategori.create.form.name || ''}
+            onChange={(val) => (stateKategori.create.form.name = val.target.value)}
+            required
+          />
+
+          <Group justify="right" mt="md">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
               }}
-              label={<Text fw={"bold"} fz={"sm"}>Nama Kategori Prestasi Desa</Text>}
-              placeholder='Masukkan nama kategori prestasi desa'
-            />
-            <Group>
-              <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-            </Group>
-          </Stack>
-        </Paper>
-      </Box>
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
     </Box>
   );
 }
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/page.tsx
index 768fd302..19629843 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/kategori-prestasi-desa/page.tsx
@@ -1,13 +1,12 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr } from '@mantine/core';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconEdit, IconSearch, IconX } from '@tabler/icons-react';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import prestasiState from '../../../_state/landing-page/prestasi-desa';
 
@@ -18,7 +17,7 @@ function KategoriPrestasiDesa() {
     <Box>
       <HeaderSearch
         title='Kategori Prestasi Desa'
-        placeholder='pencarian'
+        placeholder='Cari kategori prestasi...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -65,60 +64,100 @@ function ListKategoriPrestasi({ search }: { search: string }) {
   }
 
   return (
-    <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Kategori Prestasi Desa'
-          href='/admin/landing-page/prestasi-desa/kategori-prestasi-desa/create'
-        />
-        <Box style={{ overflowY: "auto" }}>
-          <Table striped withTableBorder withRowBorders>
+    <Box>
+      <Paper bg={colors['white-1']} p="lg" radius="md" shadow="sm" withBorder>
+        <Group justify="space-between" mb="md">
+          <Title order={4} c="dark">List Kategori Prestasi</Title>
+          <Tooltip label="Tambah Kategori Prestasi" withArrow>
+            <Button leftSection={<IconPlus size={18} />} color="blue" variant="light" onClick={() => router.push('/admin/landing-page/prestasi-desa/kategori-prestasi-desa/create')}>
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table verticalSpacing="sm" highlightOnHover>
             <TableThead>
               <TableTr>
                 <TableTh>Nama Kategori</TableTh>
-                <TableTh>Edit</TableTh>
-                <TableTh>Delete</TableTh>
+                <TableTh style={{ width: '120px' }} ta={'center'}>Edit</TableTh>
+                <TableTh ta={'center'} style={{ width: '120px' }}>Delete</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
-              {filteredData.map((item) => (
-                <TableTr key={item.id}>
-                  <TableTd>{item.name}</TableTd>
-                  <TableTd>
-                    <Button color="green" onClick={() => router.push(`/admin/landing-page/prestasi-desa/kategori-prestasi-desa/${item.id}`)}>
-                      <IconEdit size={20} />
-                    </Button>
-                  </TableTd>
-                  <TableTd>
-                    <Button color="red" onClick={() => {
-                      setSelectedId(item.id)
-                      setModalHapus(true)
-                    }}>
-                      <IconX size={20} />
-                    </Button>
+              {filteredData.length === 0 ? (
+                <TableTr>
+                  <TableTd colSpan={2} style={{ textAlign: 'center' }}>
+                    <Text py="md" c="dimmed">
+                      {search ? 'Tidak ada hasil yang cocok' : 'Belum ada data kategori'}
+                    </Text>
                   </TableTd>
                 </TableTr>
-              ))}
+              ) : (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd>{item.name}</TableTd>
+                    <TableTd style={{ textAlign: 'center', width: '120px' }}>
+                      <Tooltip label="Edit" withArrow position="top">
+                        <Button
+                          variant="light"
+                          color="blue"
+                          size="sm"
+                          onClick={() => router.push(`/admin/landing-page/prestasi-desa/kategori-prestasi-desa/${item.id}`)}
+                        >
+                          <IconEdit size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                    <TableTd style={{ textAlign: 'center', width: '120px' }}>
+                      <Tooltip label="Hapus" withArrow position="top">
+                        <Button
+                          variant="light"
+                          color="red"
+                          size="sm"
+                          onClick={() => {
+                            setSelectedId(item.id);
+                            setModalHapus(true);
+                          }}
+                        >
+                          <IconTrash size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                  </TableTr>
+                ))
+              )}
             </TableTbody>
           </Table>
         </Box>
+
+        {totalPages > 1 && (
+          <Center mt="lg">
+            <Pagination
+              value={page}
+              onChange={(newPage) => load(newPage)}
+              total={totalPages}
+              withEdges
+              size="sm"
+              styles={{
+                control: {
+                  '&[data-active]': {
+                    background: `${colors['blue-button']} !important`,
+                  },
+                },
+              }}
+            />
+          </Center>
+        )}
       </Paper>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => load(newPage)}
-          total={totalPages}
-          my={"md"}
-        />
-      </Center>
       {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus kategori prestasi desa ini?'
+        text='Apakah anda yakin ingin menghapus kategori prestasi ini?'
       />
-    </Box>
+    </Box >
   );
 }
 
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/edit/page.tsx
index 0aaebc8e..55d00cd9 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/edit/page.tsx
@@ -2,8 +2,8 @@
 'use client'
 import { useProxy } from 'valtio/utils';
 
-import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput } from '@mantine/core';
-import { IconArrowBack, IconFile, IconUpload, IconX } from '@tabler/icons-react';
+import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
+import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 
@@ -109,122 +109,144 @@ function EditPrestasiDesa() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Edit List Prestasi Desa</Text>
-          {editState.findUnique.data ? (
-            <Paper key={editState.findUnique.data.id}>
-              <Stack gap={"xs"}>
-                <TextInput
-                  value={formData.name}
-                  onChange={(val) => {
-                    setFormData({
-                      ...formData,
-                      name: val.target.value
-                    })
-                  }}
-                  label={<Text fw={"bold"} fz={"sm"}>Judul</Text>}
-                  placeholder='Masukkan judul'
-                />
-                <Box>
-                  <Text fz={"sm"} fw={"bold"}>Deskripsi</Text>
-                  <EditEditor
-                    value={formData.deskripsi}
-                    onChange={(val) => {
-                      setFormData({
-                        ...formData,
-                        deskripsi: val
-                      })
-                    }}
-                  />
-                </Box>
-                <Select
-                  value={formData.kategoriId}
-                  onChange={(val) => {
-                    setFormData({
-                      ...formData,
-                      kategoriId: val ?? ""
-                    })
-                  }}
-                  label={<Text fw={"bold"} fz={"sm"}>Kategori</Text>}
-                  placeholder="Pilih kategori"
-                  data={
-                    prestasiState.kategoriPrestasi.findMany.data?.map((v) => ({
-                      value: v.id,
-                      label: v.name,
-                    })) || []
-                  }
-                />
-                <Box>
-                  <Text fz={"md"} fw={"bold"}>File Image</Text>
-                  <Stack gap={"xs"}>
-                    <Dropzone
-                      onDrop={(files) => {
-                        const selectedFile = files[0]; // Ambil file pertama
-                        if (selectedFile) {
-                          setFile(selectedFile);
-                          setPreviewFile(URL.createObjectURL(selectedFile)); // Buat preview
-                        }
-                      }}
-                      onReject={() => toast.error('File tidak valid.')}
-                      maxSize={5 * 1024 ** 2} // Maks 5MB
-                      accept={{
-                        'image/*': ['.png', '.jpg', '.jpeg', '.gif', '.webp'],
-                      }}
-                    >
-                      <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                        <Dropzone.Accept>
-                          <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                        </Dropzone.Accept>
-                        <Dropzone.Reject>
-                          <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                        </Dropzone.Reject>
-                        <Dropzone.Idle>
-                          <IconFile size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                        </Dropzone.Idle>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Prestasi Desa
+        </Title>
+      </Group>
 
-                        <div>
-                          <Text size="xl" inline>
-                            Drag file ke sini atau klik untuk pilih file
-                          </Text>
-                          <Text size="sm" c="dimmed" inline mt={7}>
-                            Maksimal 5MB dan harus format image
-                          </Text>
-                        </div>
-                      </Group>
-                    </Dropzone>
-                    <Box>
-                      <Text fw={"bold"} fz={"lg"}>Image</Text>
-                      {previewFile ? (
-                        <Image
-                          alt=''
-                          src={previewFile}
-                          width="100%"
-                          height="500px"
-                          style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                        />
-                      ) : (
-                        <Text>Tidak ada image tersedia</Text>
-                      )}
-                    </Box>
-                  </Stack>
-                </Box>
-                <Group>
-                  <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-                </Group>
-              </Stack>
-            </Paper>
-          ) : null}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Judul Prestasi"
+            placeholder="Masukkan judul prestasi"
+            value={formData.name}
+            onChange={(val) => {
+              setFormData({
+                ...formData,
+                name: val.target.value
+              });
+            }}
+            required
+          />
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi
+            </Text>
+            <EditEditor
+              value={formData.deskripsi}
+              onChange={(val) => {
+                setFormData({
+                  ...formData,
+                  deskripsi: val
+                });
+              }}
+            />
+          </Box>
+
+          <Select
+            label="Kategori"
+            placeholder="Pilih kategori"
+            value={formData.kategoriId}
+            onChange={(val) => {
+              setFormData({
+                ...formData,
+                kategoriId: val ?? ""
+              });
+            }}
+            data={
+              prestasiState.kategoriPrestasi.findMany.data?.map((v) => ({
+                value: v.id,
+                label: v.name,
+              })) || []
+            }
+            required
+          />
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Prestasi
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewFile(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar wajib
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
+
+            {previewFile && (
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
+                <Image
+                  src={previewFile}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{ maxHeight: 220, objectFit: 'contain', border: `1px solid ${colors['blue-button']}` }}
+                />
+              </Box>
+            )}
+          </Box>
+
+          <Group justify="right" mt="md">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
   );
 }
 
+
 export default EditPrestasiDesa;
\ No newline at end of file
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/page.tsx
index 6091c53f..4414dc2d 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/[id]/page.tsx
@@ -2,9 +2,9 @@
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import prestasiState from '@/app/admin/(dashboard)/_state/landing-page/prestasi-desa';
 import colors from '@/con/colors';
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -40,45 +40,69 @@ function DetailPrestasiDesa() {
   }
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail List Prestasi Desa</Text>
-          {detailState.findUnique.data ? (
-            <Paper key={detailState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Judul</Text>
-                  <Text fz={"lg"}>{detailState.findUnique.data?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: detailState.findUnique.data?.deskripsi }} />
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Kategori</Text>
-                  <Text fz={"lg"}>{detailState.findUnique.data?.kategori?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Image</Text>
-                  {detailState.findUnique.data?.image?.link ? (
-                    <iframe
-                      src={detailState.findUnique.data.image.link}
-                      width="100%"
-                      height="500px"
-                      style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                    />
-                  ) : (
-                    <Text>Tidak ada image tersedia</Text>
-                  )}
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "60%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Prestasi Desa
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">Judul</Text>
+                <Text fz="md" c="dimmed">{detailState.findUnique.data?.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Kategori</Text>
+                <Text fz="md" c="dimmed">{detailState.findUnique.data?.kategori?.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Deskripsi</Text>
+                <Box 
+                  fz="md" 
+                  c="dimmed" 
+                  dangerouslySetInnerHTML={{ __html: detailState.findUnique.data?.deskripsi || '-' }}
+                />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Gambar</Text>
+                {detailState.findUnique.data?.image?.link ? (
+                  <Image
+                    src={detailState.findUnique.data.image.link}
+                    alt={detailState.findUnique.data.name || 'Gambar Prestasi'}
+                    w={300}
+                    fit="contain"
+                    style={{ borderRadius: '8px', border: '1px solid #e0e0e0' }}
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
+              </Box>
+
+              <Group gap="sm">
+                <Tooltip label="Hapus Prestasi" withArrow position="top">
                   <Button
+                    color="red"
                     onClick={() => {
                       if (detailState.findUnique.data) {
                         setSelectedId(detailState.findUnique.data.id);
@@ -86,25 +110,33 @@ function DetailPrestasiDesa() {
                       }
                     }}
                     disabled={detailState.delete.loading || !detailState.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
-                    <IconX size={20} />
+                    <IconTrash size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Prestasi" withArrow position="top">
                   <Button
+                    color="green"
                     onClick={() => {
                       if (detailState.findUnique.data) {
                         router.push(`/admin/landing-page/prestasi-desa/list-prestasi-desa/${detailState.findUnique.data.id}/edit`);
                       }
                     }}
                     disabled={!detailState.findUnique.data}
-                    color={"green"}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
         </Stack>
       </Paper>
 
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/create/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/create/page.tsx
index f29f0d0b..a04e43cb 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/create/page.tsx
@@ -1,13 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
 import prestasiState from '@/app/admin/(dashboard)/_state/landing-page/prestasi-desa';
-
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Paper, Select, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconImageInPicture, IconUpload, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
@@ -60,103 +59,132 @@ function CreatePrestasiDesa() {
     router.push("/admin/landing-page/prestasi-desa/list-prestasi-desa")
   }
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Prestasi Desa
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Prestasi Desa</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <Box>
-            <Text fz={"md"} fw={"bold"}>File Image</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewFile(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.jpg', '.jpeg', '.png'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconImageInPicture size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Prestasi
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewFile(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid. Hanya file gambar yang diperbolehkan.')}
+              maxSize={5 * 1024 ** 2} // 5MB
+              accept={{
+                'image/*': ['.jpg', '.jpeg', '.png', '.webp'],
+              }}
+            >
+              <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
+                <Dropzone.Accept>
+                  <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format image
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Image</Text>
-                {previewFile ? (
-                  <iframe
+                <div>
+                  <Text size="xl" inline>
+                    Seret file gambar ke sini atau klik untuk memilih
+                  </Text>
+                  <Text size="sm" c="dimmed" inline mt={7}>
+                    Unggah file gambar (maks. 5MB)
+                  </Text>
+                </div>
+              </Group>
+            </Dropzone>
+
+            {previewFile && (
+              <Box mt="md">
+                <Text size="sm" fw={500} mb={4}>
+                  Pratinjau Gambar:
+                </Text>
+                <Box style={{ maxWidth: '100%', maxHeight: '300px', overflow: 'hidden', borderRadius: '8px' }}>
+                  <Image
                     src={previewFile}
-                    width="100%"
-                    height="500px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
+                    alt="Pratinjau gambar prestasi"
+                    fit="cover"
+                    style={{ width: '100%', height: 'auto' }}
                   />
-                ) : (
-                  <Text>Tidak ada image tersedia</Text>
-                )}
+                </Box>
               </Box>
-            </Box>
+            )}
           </Box>
+
           <TextInput
+            label="Judul Prestasi"
+            placeholder="Masukkan judul prestasi"
             value={stateCreate.create.form.name}
-            onChange={(val) => {
-              stateCreate.create.form.name = val.target.value;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Judul</Text>}
-            placeholder='Masukkan judul'
+            onChange={(e) => (stateCreate.create.form.name = e.target.value)}
+            required
           />
+
           <Box>
-            <Text fz={"sm"} fw={"bold"}>Deskripsi</Text>
+            <Text fw={500} fz="sm" mb={6}>
+              Deskripsi Prestasi
+            </Text>
             <CreateEditor
               value={stateCreate.create.form.deskripsi}
-              onChange={(val) => {
-                stateCreate.create.form.deskripsi = val;
-              }}
+              onChange={(val) => (stateCreate.create.form.deskripsi = val)}
             />
           </Box>
+
           <Select
-            value={stateCreate.create.form.kategoriId}
-            onChange={(val) => {
-              stateCreate.create.form.kategoriId = val ?? "";
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Kategori</Text>}
+            label="Kategori Prestasi"
             placeholder="Pilih kategori"
+            value={stateCreate.create.form.kategoriId}
+            onChange={(val) => (stateCreate.create.form.kategoriId = val ?? '')}
             data={
               prestasiState.kategoriPrestasi.findMany.data?.map((v) => ({
                 value: v.id,
                 label: v.name,
               })) || []
             }
+            required
           />
 
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+          <Group justify="flex-end" mt="md">
+            <Button
+              variant="light"
+              color="gray"
+              onClick={() => router.back()}
+              style={{ marginRight: 'auto' }}
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={handleSubmit}
+              bg={colors['blue-button']}
+              style={{ boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)' }}
+            >
+              Simpan Prestasi
+            </Button>
           </Group>
         </Stack>
       </Paper>
diff --git a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/page.tsx b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/page.tsx
index 36e1d86a..db28635a 100644
--- a/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/prestasi-desa/list-prestasi-desa/page.tsx
@@ -1,23 +1,21 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
-import { IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
+import { IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import prestasiState from '../../../_state/landing-page/prestasi-desa';
 
-
 function ListPrestasiDesa() {
   const [search, setSearch] = useState('');
   return (
     <Box>
       <HeaderSearch
-        title='List Prestasi Desa'
-        placeholder='pencarian'
+        title='Prestasi Desa'
+        placeholder='Cari nama prestasi...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -31,7 +29,7 @@ function ListPrestasi({ search }: { search: string }) {
   const listState = useProxy(prestasiState.prestasiDesa)
   const router = useRouter();
 
-  const{
+  const {
     data,
     page,
     totalPages,
@@ -62,63 +60,88 @@ function ListPrestasi({ search }: { search: string }) {
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <JudulList
-            title='List Prestasi Desa'
-            href='/admin/landing-page/prestasi-desa/list-prestasi-desa/create'
-          />
-          <Box style={{ overflowX: 'auto' }}>
-            <Table striped withRowBorders withTableBorder style={{ minWidth: '700px' }}>
-              <TableThead>
-                <TableTr>
-                  <TableTh>Nama Prestasi Desa</TableTh>
-                  <TableTh>Deskripsi Prestasi Desa</TableTh>
-                  <TableTh>Kategori Prestasi Desa</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item) => (
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Prestasi Desa</Title>
+          <Tooltip label="Tambah Prestasi" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/landing-page/prestasi-desa/list-prestasi-desa/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '25%' }}>Nama Prestasi</TableTh>
+                <TableTh style={{ width: '25%' }}>Deskripsi</TableTh>
+                <TableTh style={{ width: '25%' }}>Kategori</TableTh>
+                <TableTh style={{ width: '25%', textAlign: 'center' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd>
+                    <TableTd style={{ width: '25%' }}>
                       <Box w={100}>
                         <Text truncate="end" fz={"sm"}>{item.name}</Text>
                       </Box>
                     </TableTd>
-                    <TableTd >
-                      <Box w={150}>
-                        <Text truncate="end" fz={"sm"} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
-                      </Box>
+                    <TableTd style={{ width: '25%' }}>
+                      <Text lineClamp={1} fz="sm" c="dimmed" dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
                     </TableTd>
-                    <TableTd>{item.kategori?.name || 'No Category'}</TableTd>
-                    <TableTd>
-                      <Button onClick={() => router.push(`/admin/landing-page/prestasi-desa/list-prestasi-desa/${item.id}`)}>
-                        <IconDeviceImacCog size={25} />
-                      </Button>
+                    <TableTd style={{ width: '25%' }}>
+                      <Text truncate="end" fz={"sm"}>{item.kategori?.name || 'Tidak ada kategori'}</Text>
+                    </TableTd>
+                    <TableTd style={{ width: '25%', textAlign: 'center' }}>
+                      <Tooltip label="Kelola Prestasi" withArrow>
+                        <Button
+                          variant="light"
+                          color="blue"
+                          onClick={() => router.push(`/admin/landing-page/prestasi-desa/list-prestasi-desa/${item.id}`)}
+                          size="sm"
+                        >
+                          <IconDeviceImacCog size={20} />
+                        </Button>
+                      </Tooltip>
                     </TableTd>
                   </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4} style={{ textAlign: 'center' }}>
+                    <Text c="dimmed" py="md">Tidak ada data prestasi</Text>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => load(newPage)}
-          total={totalPages}
-          my={"md"}
-        />
-      </Center>
+      {totalPages > 1 && (
+        <Center mt="lg">
+          <Pagination
+            value={page}
+            onChange={load}
+            total={totalPages}
+            withEdges
+            size="sm"
+          />
+        </Center>
+      )}
     </Box>
   )
 }
diff --git a/src/app/admin/(dashboard)/landing-page/profile/_lib/layoutTabs.tsx b/src/app/admin/(dashboard)/landing-page/profile/_lib/layoutTabs.tsx
index ff15c4e7..b0313faa 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/_lib/layoutTabs.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/_lib/layoutTabs.tsx
@@ -72,7 +72,7 @@ function LayoutTabs({ children }: { children: React.ReactNode }) {
           }}
         >
           {tabs.map((tab, i) => (
-            <Tooltip key={i} label={tab.tooltip} position="bottom" withArrow>
+            <Tooltip key={i} label={tab.tooltip} position="bottom" withArrow transitionProps={{ transition: 'pop', duration: 200 }}>
               <TabsTab
                 value={tab.value}
                 leftSection={tab.icon}
diff --git a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/edit/page.tsx
index b406dcff..ed1ef43a 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/edit/page.tsx
@@ -87,7 +87,7 @@ function EditMediaSosial() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/page.tsx
index 9e4e6acb..807f3442 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/[id]/page.tsx
@@ -51,6 +51,7 @@ function DetailMediaSosial() {
       </Button>
 
       <Paper
+      withBorder
         w={{ base: "100%", md: "60%" }}
         bg={colors['white-1']}
         p="lg"
diff --git a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/create/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/create/page.tsx
index 3063c713..49de8819 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/create/page.tsx
@@ -69,7 +69,7 @@ export default function CreateMediaSosial() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/page.tsx
index b6cbebb4..fb276ffb 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/media-sosial/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/media-sosial/page.tsx
@@ -53,7 +53,7 @@ function ListMediaSosial({ search }: { search: string }) {
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
         <Group justify="space-between" mb="md">
           <Title order={4}>Daftar Media Sosial</Title>
           <Tooltip label="Tambah Media Sosial" withArrow>
@@ -66,34 +66,34 @@ function ListMediaSosial({ search }: { search: string }) {
           <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh>Nama Media Sosial / Kontak</TableTh>
-                <TableTh>Gambar</TableTh>
-                <TableTh>Icon / No. Telepon</TableTh>
-                <TableTh>Aksi</TableTh>
+                <TableTh style={{ width: '25%' }}>Nama Media Sosial / Kontak</TableTh>
+                <TableTh style={{ width: '20%' }}>Gambar</TableTh>
+                <TableTh style={{ width: '20%' }}>Icon / No. Telepon</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
               {filteredData.length > 0 ? (
                 filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd>
-                      <Text fw={500}>{item.name}</Text>
+                    <TableTd style={{ width: '25%',  }}>
+                      <Text fw={500} truncate="end" lineClamp={1}>{item.name}</Text>
                     </TableTd>
-                    <TableTd>
-                      <Box w={50} h={50} style={{ borderRadius: 8, overflow: 'hidden' }}>
-                        {item.image?.link ? (
-                          <Image src={item.image.link} alt={item.name} fit="cover" />
-                        ) : (
-                          <Box bg={colors['blue-button']} w="100%" h="100%" />
-                        )}
-                      </Box>
+                    <TableTd style={{ width: '20%',  }}>
+                        <Box w={50} h={50} style={{ borderRadius: 8, overflow: 'hidden',  }}>
+                          {item.image?.link ? (
+                            <Image src={item.image.link} alt={item.name} fit="cover" />
+                          ) : (
+                            <Box bg={colors['blue-button']} w="100%" h="100%" />
+                          )}
+                        </Box>
                     </TableTd>
-                    <TableTd>
-                      <Text truncate fz="sm" color="dimmed">
+                    <TableTd style={{ width: '20%',  }}>
+                      <Text truncate fz="sm" c="dimmed">
                         {item.iconUrl || item.noTelp || '-'}
                       </Text>
                     </TableTd>
-                    <TableTd>
+                    <TableTd style={{ width: '15%'}}>
                       <Button
                         variant="light"
                         color="blue"
diff --git a/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/[id]/page.tsx
index bc1213ad..8f3c6f81 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/[id]/page.tsx
@@ -145,7 +145,7 @@ function EditPejabatDesa() {
     <Box>
       <Stack gap="xs">
         <Group mb="md">
-          <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+          <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
             <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
               <IconArrowBack color={colors['blue-button']} size={24} />
             </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/page.tsx
index 914ff5fd..47030974 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/pejabat-desa/page.tsx
@@ -37,7 +37,7 @@ function Page() {
           <GridCol span={{ base: 12, md: 1 }}>
             <Tooltip label="Edit Profil Pejabat" withArrow>
               <Button
-                c="blue"
+                c="green"
                 variant="light"
                 leftSection={<IconEdit size={18} stroke={2} />}
                 radius="md"
@@ -49,7 +49,7 @@ function Page() {
           </GridCol>
         </Grid>
         {dataArray.map((item) => (
-          <Paper key={item.id} p="xl" bg={colors['BG-trans']} radius="md" shadow="xs">
+          <Paper key={item.id} p="xl" bg={'white'} withBorder radius="md" shadow="xs">
             <Box px={{ base: "sm", md: 100 }}>
               <Grid>
                 <GridCol span={12}>
diff --git a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/edit/page.tsx
index 642c6d6f..e90e2399 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/edit/page.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
+import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
 import profileLandingPageState from '@/app/admin/(dashboard)/_state/landing-page/profile';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
@@ -99,7 +100,7 @@ function EditProgramInovasi() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
@@ -176,13 +177,16 @@ function EditProgramInovasi() {
             required
           />
 
-          <TextInput
-            label="Deskripsi"
-            placeholder="Masukkan deskripsi program inovasi"
-            value={formData.description}
-            onChange={(e) => setFormData({ ...formData, description: e.target.value })}
-            required
-          />
+          <Box>
+            <Text fz={"sm"} fw={"bold"}>Deskripsi</Text>
+            <EditEditor
+              value={formData.description}
+              onChange={(htmlContent) => {
+                setFormData((prev) => ({ ...prev, description: htmlContent }));
+                stateProgramInovasi.update.form.description = htmlContent;
+              }}
+            />
+          </Box>
 
           <TextInput
             label="Link Program Inovasi"
diff --git a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/page.tsx
index 444edb94..6e62372b 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/[id]/page.tsx
@@ -51,6 +51,7 @@ function DetailProgramInovasi() {
         p="lg"
         radius="md"
         shadow="sm"
+        withBorder
       >
         <Stack gap="md">
           <Text fz="2xl" fw="bold" c={colors['blue-button']}>
@@ -64,9 +65,23 @@ function DetailProgramInovasi() {
                 <Text fz="md" c="dimmed">{data.name || '-'}</Text>
               </Box>
 
+              <Box>
+                <Text fz="lg" fw="bold">Gambar</Text>
+                {data.image?.link ? (
+                  <Image 
+                    src={data.image.link} 
+                    alt="Gambar Program" 
+                    radius="md"
+                    style={{ maxWidth: '100%', maxHeight: 300, objectFit: 'contain' }}
+                  />
+                ) : (
+                  <Text fz="md" c="dimmed">-</Text>
+                )}
+              </Box>
+
               <Box>
                 <Text fz="lg" fw="bold">Deskripsi</Text>
-                <Text fz="md" c="dimmed" style={{ whiteSpace: 'pre-wrap' }}>{data.description || '-'}</Text>
+                <Text fz="md" c="dimmed" style={{ whiteSpace: 'pre-wrap' }} dangerouslySetInnerHTML={{ __html: data.description || '-' }}></Text>
               </Box>
 
               <Box>
@@ -89,20 +104,6 @@ function DetailProgramInovasi() {
                 )}
               </Box>
 
-              <Box>
-                <Text fz="lg" fw="bold">Gambar</Text>
-                {data.image?.link ? (
-                  <Image 
-                    src={data.image.link} 
-                    alt="Gambar Program" 
-                    radius="md"
-                    style={{ maxWidth: '100%', maxHeight: 300, objectFit: 'contain' }}
-                  />
-                ) : (
-                  <Text fz="md" c="dimmed">-</Text>
-                )}
-              </Box>
-
               <Group gap="sm">
                 <Tooltip label="Hapus Program Inovasi" withArrow position="top">
                   <Button
diff --git a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/create/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/create/page.tsx
index 2bc2a018..45c2fae9 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/create/page.tsx
@@ -70,7 +70,7 @@ function CreateProgramInovasi() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/page.tsx b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/page.tsx
index 96ba3996..d5d2e121 100644
--- a/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/profile/program-inovasi/page.tsx
@@ -48,7 +48,7 @@ function ListProgramInovasi({ search }: { search: string }) {
 
   return (
     <Box py={15}>
-      <Paper bg={colors['white-1']} p="lg" radius="md" shadow="sm">
+      <Paper bg={colors['white-1']} withBorder p="lg" radius="md" shadow="sm">
         <Box mb="md" display="flex"
           style={{ justifyContent: 'space-between', alignItems: 'center' }}
         >
@@ -91,9 +91,7 @@ function ListProgramInovasi({ search }: { search: string }) {
                       <Text fw={500}>{item.name}</Text>
                     </TableTd>
                     <TableTd style={{ maxWidth: 250 }}>
-                      <Text fz="sm" lineClamp={2}>
-                        {item.description}
-                      </Text>
+                      <Text fz="sm" lineClamp={1} dangerouslySetInnerHTML={{ __html: item.description || '-' }}></Text>
                     </TableTd>
                     <TableTd style={{ maxWidth: 250 }}>
                       <Tooltip label="Buka tautan program" position="top" withArrow>
diff --git a/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/edit/page.tsx b/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/edit/page.tsx
index f48cc975..96a3665d 100644
--- a/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/edit/page.tsx
@@ -12,10 +12,12 @@ import {
   Stack,
   Text,
   TextInput,
-  Title
+  Title,
+  Tooltip,
+  Image
 } from "@mantine/core";
 import { Dropzone } from "@mantine/dropzone";
-import { IconArrowBack, IconImageInPicture, IconUpload, IconX } from "@tabler/icons-react";
+import { IconArrowBack, IconDeviceFloppy, IconPhoto, IconUpload, IconX } from "@tabler/icons-react";
 import { useParams, useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { toast } from "react-toastify";
@@ -97,82 +99,111 @@ function EditKolaborasiInovasi() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors["blue-button"]} size={30} />
-        </Button>
-      </Box>
-      <Paper bg={"white"} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Edit SDGs Desa</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit SDGs Desa
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar SDGs Desa
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar wajib
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
+
+            {previewImage && (
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{ maxHeight: 220, objectFit: 'contain', border: `1px solid ${colors['blue-button']}` }}
+                />
+              </Box>
+            )}
+          </Box>
+
           <TextInput
+            label="Nama SDGs Desa"
+            placeholder="Masukkan nama SDGs Desa"
             value={formData.name}
             onChange={(e) => setFormData({ ...formData, name: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Nama</Text>}
-            placeholder="masukkan nama"
+            required
           />
 
           <TextInput
+            label="Jumlah"
+            placeholder="Masukkan jumlah"
             value={formData.jumlah}
             onChange={(e) => setFormData({ ...formData, jumlah: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Jumlah</Text>}
-            placeholder="masukkan jumlah"
+            required
+            type="number"
           />
-          <Box>
-            <Text fz={"md"} fw={"bold"}>File Image</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.jpeg', '.jpg', '.png', '.gif', '.webp', '.svg'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconImageInPicture size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format image
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Dokumen</Text>
-                {previewImage ? (
-                  <iframe
-                    src={previewImage}
-                    width="100%"
-                    height="250px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                  />
-                ) : (
-                  <Text>Tidak ada image tersedia</Text>
-                )}
-              </Box>
-            </Box>
-          </Box>
-          <Button onClick={handleSubmit}>Simpan</Button>
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              leftSection={<IconDeviceFloppy size={20} />}
+              loading={sdgsState.edit.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/page.tsx b/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/page.tsx
index 2336d1b9..14535ce9 100644
--- a/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/sdgs-desa/[id]/page.tsx
@@ -1,7 +1,6 @@
 'use client'
 import { useProxy } from 'valtio/utils';
-
-import { Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
@@ -12,11 +11,11 @@ import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import sdgsDesa from '../../../_state/landing-page/sdgs-desa';
 
 function DetailSDGSDesa() {
-  const sdgsState = useProxy(sdgsDesa)
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
-  const router = useRouter()
+  const sdgsState = useProxy(sdgsDesa);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
+  const router = useRouter();
 
   useShallowEffect(() => {
     sdgsState.findUnique.load(params?.id as string)
@@ -35,73 +34,104 @@ function DetailSDGSDesa() {
   if (!sdgsState.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={40} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = sdgsState.findUnique.data;
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail SDGS Desa</Text>
-          {sdgsState.findUnique.data ? (
-            <Paper key={sdgsState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Nama SDGS Desa</Text>
-                  <Text fz={"lg"}>{sdgsState.findUnique.data?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Jumlah</Text>
-                  <Text fz={"lg"}>{sdgsState.findUnique.data?.jumlah}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Gambar</Text>
-                  <Image w={{ base: 150, md: 150, lg: 150 }} src={sdgsState.findUnique.data?.image?.link} alt="gambar" />
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '60%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail SDGs Desa
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="md">
+              <Box>
+                <Text fz="lg" fw="bold" mb={4}>Nama SDGs Desa</Text>
+                <Text fz="md" c="dimmed">{data.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold" mb={4}>Jumlah</Text>
+                <Text fz="md" c="dimmed">{data.jumlah || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold" mb={4}>Gambar</Text>
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.name || 'Gambar SDGs Desa'}
+                    w={200}
+                    h={200}
+                    radius="md"
+                    fit="contain"
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
+              </Box>
+
+              <Group gap="sm" mt="md">
+                <Tooltip label="Hapus SDGs Desa" withArrow position="top">
                   <Button
+                    color="red"
                     onClick={() => {
-                      if (sdgsState.findUnique.data) {
-                        setSelectedId(sdgsState.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                     }}
-                    disabled={sdgsState.delete.loading || !sdgsState.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                    disabled={sdgsState.delete.loading}
                   >
                     <IconX size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit SDGs Desa" withArrow position="top">
                   <Button
-                    onClick={() => {
-                      if (sdgsState.findUnique.data) {
-                        router.push(`/admin/landing-page/SDGs-Desa/${sdgsState.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!sdgsState.findUnique.data}
-                    color={"green"}
+                    color="green"
+                    onClick={() => router.push(`/admin/landing-page/SDGs-Desa/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
         </Stack>
       </Paper>
 
-      {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus SDGS Desa ini?'
+        text="Apakah Anda yakin ingin menghapus SDGs Desa ini?"
       />
     </Box>
   );
diff --git a/src/app/admin/(dashboard)/landing-page/sdgs-desa/create/page.tsx b/src/app/admin/(dashboard)/landing-page/sdgs-desa/create/page.tsx
index e53c08f3..e44c801f 100644
--- a/src/app/admin/(dashboard)/landing-page/sdgs-desa/create/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/sdgs-desa/create/page.tsx
@@ -2,9 +2,9 @@
 'use client'
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconImageInPicture, IconUpload, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconDeviceFloppy, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
@@ -56,88 +56,138 @@ function CreateSDGsDesa() {
     router.push("/admin/landing-page/SDGs-Desa")
   }
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah SDGs Desa
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create SDGs Desa</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <Box>
-            <Text fz={"md"} fw={"bold"}>File Image</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{
-                  'application/*': ['.jpeg', '.jpg', '.png', '.gif', '.webp', '.svg'],
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconImageInPicture size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar SDGs Desa
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid.')}
+              maxSize={5 * 1024 ** 2}
+              accept={{
+                'image/*': ['.jpeg', '.jpg', '.png', '.gif', '.webp', '.svg'],
+              }}
+              radius="md"
+            >
+              <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
+                <Dropzone.Accept>
+                  <IconUpload size={52} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag file ke sini atau klik untuk pilih file
+                <div style={{ textAlign: 'center' }}>
+                  <Text size="xl" inline>
+                    Drag file ke sini atau klik untuk memilih
+                  </Text>
+                  <Text size="sm" c="dimmed" inline mt={7} display="block">
+                    Maksimal 5MB (JPEG, JPG, PNG, GIF, WEBP, SVG)
+                  </Text>
+                </div>
+              </Group>
+            </Dropzone>
+
+            {previewImage && (
+              <Box mt="md">
+                <Text fw={500} fz="sm" mb={4}>
+                      Pratinjau Gambar
                     </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format image
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              <Box>
-                <Text fw={"bold"} fz={"lg"}>Dokumen</Text>
-                {previewImage ? (
-                  <iframe
-                    src={previewImage}
-                    width="100%"
-                    height="250px"
-                    style={{ border: "1px solid #ccc", borderRadius: "8px" }}
-                  />
-                ) : (
-                  <Text>Tidak ada image tersedia</Text>
-                )}
+                    <Box
+                      style={{
+                        border: '1px solid #e0e0e0',
+                        borderRadius: '8px',
+                        overflow: 'hidden',
+                        maxWidth: '300px'
+                      }}
+                    >
+                      <Image
+                        src={previewImage}
+                        alt="Preview"
+                        style={{ width: '100%', height: 'auto' }}
+                      />
+                    </Box>
               </Box>
-            </Box>
+            )}
           </Box>
           <TextInput
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Nama SDGs Desa
+              </Text>
+            }
+            placeholder="Masukkan nama SDGs Desa"
             value={stateSDGSDesa.create.form.name}
             onChange={(val) => {
               stateSDGSDesa.create.form.name = val.target.value;
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Judul</Text>}
-            placeholder='Masukkan judul'
+            required
+            radius="md"
           />
-           <TextInput
-           type='number'
+
+          <TextInput
+            type="number"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Jumlah
+              </Text>
+            }
+            placeholder="Masukkan jumlah"
             value={stateSDGSDesa.create.form.jumlah}
             onChange={(val) => {
               stateSDGSDesa.create.form.jumlah = val.target.value;
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Jumlah</Text>}
-            placeholder='Masukkan jumlah'
+            required
+            min={0}
+            radius="md"
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              variant="light"
+              color="red"
+              onClick={() => router.back()}
+            >
+              Batal
+            </Button>
+            <Button
+              leftSection={<IconDeviceFloppy size={20} />}
+              onClick={handleSubmit}
+              loading={stateSDGSDesa.create.loading}
+              color={colors['blue-button']}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>
diff --git a/src/app/admin/(dashboard)/landing-page/sdgs-desa/page.tsx b/src/app/admin/(dashboard)/landing-page/sdgs-desa/page.tsx
index 3f7d503b..c8b25c7d 100644
--- a/src/app/admin/(dashboard)/landing-page/sdgs-desa/page.tsx
+++ b/src/app/admin/(dashboard)/landing-page/sdgs-desa/page.tsx
@@ -1,13 +1,12 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../_com/header';
-import JudulList from '../../_com/judulList';
 import sdgsDesa from '../../_state/landing-page/sdgs-desa';
 
 
@@ -17,7 +16,7 @@ function SdgsDesa() {
     <Box>
       <HeaderSearch
         title='SDGs Desa'
-        placeholder='pencarian'
+        placeholder='Cari SDGs Desa...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -57,20 +56,36 @@ function ListSdgsDesa({ search }: { search: string }) {
   if (data.length === 0) {
     return (
       <Box py={10}>
-        <Paper bg={colors['white-1']} p={'md'}>
-          <JudulList
-            title='List Desa Anti Korupsi'
-            href='/admin/landing-page/desa-anti-korupsi/list-desa-anti-korupsi/create'
-          />
-          <Box style={{ overflowX: "auto" }}>
-            <Table striped withTableBorder withRowBorders>
+        <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+          <Group justify="space-between" mb="md">
+            <Title order={4}>Daftar SDGs Desa</Title>
+            <Tooltip label="Tambah SDGs Desa" withArrow>
+              <Button 
+                leftSection={<IconPlus size={18} />} 
+                color={colors['blue-button']} 
+                variant="light"
+                onClick={() => router.push('/admin/landing-page/SDGs-Desa/create')}
+              >
+                Tambah Baru
+              </Button>
+            </Tooltip>
+          </Group>
+          <Box style={{ overflowX: 'auto' }}>
+            <Table>
               <TableThead>
                 <TableTr>
-                  <TableTh>Nama SDGs Desa</TableTh>
-                  <TableTh>Jumlah SDGs Desa</TableTh>
-                  <TableTh>Detail</TableTh>
+                  <TableTh style={{ width: '60%' }}>Nama SDGs Desa</TableTh>
+                  <TableTh style={{ width: '20%' }}>Jumlah</TableTh>
+                  <TableTh style={{ width: '20%', textAlign: 'center' }}>Aksi</TableTh>
                 </TableTr>
               </TableThead>
+              <TableTbody>
+                <TableTr>
+                  <TableTd colSpan={3} style={{ textAlign: 'center', padding: '2rem' }}>
+                    <Text c="dimmed">Tidak ada data SDGs Desa</Text>
+                  </TableTd>
+                </TableTr>
+              </TableTbody>
             </Table>
           </Box>
         </Paper>
@@ -80,54 +95,70 @@ function ListSdgsDesa({ search }: { search: string }) {
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <JudulList
-            title='SDGs Desa'
-            href='/admin/landing-page/SDGs-Desa/create'
-          />
-          <Box style={{ overflowX: 'auto' }}>
-            <Table striped withRowBorders withTableBorder style={{ minWidth: '700px' }}>
-              <TableThead>
-                <TableTr>
-                  <TableTh>Nama SDGs Desa</TableTh>
-                  <TableTh>Jumlah SDGs Desa</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item) => (
-                  <TableTr key={item.id}>
-                    <TableTd>
-                      <Box w={100}>
-                        <Text truncate="end" fz={"sm"}>{item.name}</Text>
-                      </Box>
-                    </TableTd>
-                    <TableTd>
-                      <Text truncate="end" fz={"sm"}>{item.jumlah}</Text>
-                    </TableTd>
-                    <TableTd>
-                      <Button onClick={() => router.push(`/admin/landing-page/SDGs-Desa/${item.id}`)}>
-                        <IconDeviceImacCog size={25} />
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar SDGs Desa</Title>
+          <Tooltip label="Tambah SDGs Desa" withArrow>
+            <Button 
+              leftSection={<IconPlus size={18} />} 
+              color={colors['blue-button']} 
+              variant="light" 
+              onClick={() => router.push('/admin/landing-page/SDGs-Desa/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '60%' }}>Nama SDGs Desa</TableTh>
+                <TableTh style={{ width: '20%' }}>Jumlah</TableTh>
+                <TableTh style={{ width: '20%', textAlign: 'center' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.map((item) => (
+                <TableTr key={item.id}>
+                  <TableTd style={{ width: '60%' }}>
+                    <Text fw={500} truncate="end" lineClamp={1}>
+                      {item.name}
+                    </Text>
+                  </TableTd>
+                  <TableTd style={{ width: '20%' }}>
+                    <Text fz="sm" c="dimmed">
+                      {item.jumlah || '0'}
+                    </Text>
+                  </TableTd>
+                  <TableTd style={{ width: '20%', textAlign: 'center' }}>
+                    <Tooltip label="Lihat Detail" withArrow>
+                      <Button 
+                        variant="light" 
+                        color="blue" 
+                        size="sm"
+                        onClick={() => router.push(`/admin/landing-page/SDGs-Desa/${item.id}`)}
+                      >
+                        <IconDeviceImacCog size={18} />
                       </Button>
-                    </TableTd>
-                  </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                    </Tooltip>
+                  </TableTd>
+                </TableTr>
+              ))}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
-      <Center>
+      <Center mt="lg">
         <Pagination
           value={page}
           onChange={(newPage) => {
             load(newPage, 10);
             window.scrollTo(0, 0);
           }}
-          total={totalPages}
-          mt="md"
-          mb="md"
+          total={Math.max(1, totalPages)}
+          withEdges
+          radius="md"
         />
       </Center>
     </Box>
diff --git a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/[id]/edit/page.tsx b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/[id]/edit/page.tsx
index c8bb4fb8..49034b5c 100644
--- a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/[id]/edit/page.tsx
@@ -98,7 +98,7 @@ function EditKeteranganBankSampahTerdekat() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/create/page.tsx b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/create/page.tsx
index ac94fafa..883c89bf 100644
--- a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/create/page.tsx
+++ b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/keterangan-bank-sampah-terdekat/create/page.tsx
@@ -54,7 +54,7 @@ function CreateKeteranganBankSampahTerdekat() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
             <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
diff --git a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/[id]/page.tsx b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/[id]/page.tsx
index eb377a84..e0427dc8 100644
--- a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/[id]/page.tsx
@@ -78,7 +78,7 @@ function EditProgramKreatifDesa() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button 
             variant="subtle" 
             onClick={() => router.back()} 
diff --git a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/page.tsx b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/page.tsx
index cfcbb994..cfba2c11 100644
--- a/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/page.tsx
+++ b/src/app/admin/(dashboard)/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/page.tsx
@@ -129,7 +129,7 @@ function ListPengelolaanSampahBankSampah({ search }: { search: string }) {
                       <Tooltip label="Edit" withArrow>
                         <Button
                           variant="light"
-                          color="blue"
+                          color="green"
                           size="sm"
                           onClick={() => router.push(`/admin/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah/${item.id}`)}
                         >
diff --git a/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/[id]/page.tsx b/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/[id]/page.tsx
index d381da61..17188b39 100644
--- a/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/[id]/page.tsx
@@ -70,7 +70,7 @@ function EditProgramKreatifDesa() {
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
-        <Tooltip label="Kembali ke halaman sebelumnya" color="blue" withArrow>
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
           <Button 
             variant="subtle" 
             onClick={() => router.back()} 
diff --git a/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/page.tsx b/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/page.tsx
index d6b7cb29..721dba5b 100644
--- a/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/page.tsx
+++ b/src/app/admin/(dashboard)/pendidikan/beasiswa-desa/keunggulan-program/page.tsx
@@ -105,7 +105,7 @@ function ListKeunggulanProgram({ search }: { search: string }) {
                       <Tooltip label="Edit" withArrow>
                         <Button
                           variant="light"
-                          color="blue"
+                          color="green"
                           size="sm"
                           onClick={() => router.push(`/admin/pendidikan/beasiswa-desa/keunggulan-program/${item.id}`)}
                         >
diff --git a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/edit/page.tsx b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/edit/page.tsx
index 0e600ea3..c61cca2a 100644
--- a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/edit/page.tsx
@@ -1,9 +1,9 @@
-'use client'
+'use client';
 /* eslint-disable react-hooks/exhaustive-deps */
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
 import daftarInformasiPublik from '@/app/admin/(dashboard)/_state/ppid/daftar_informasi_publik/daftarInformasiPublik';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -73,28 +73,44 @@ function EditDaftarInformasiPublik() {
   }
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors["blue-button"]} size={30} />
-        </Button>
-      </Box>
-      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Edit Daftar Informasi Publik Desa Darmasaba</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Daftar Informasi Publik
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="xl">
           <TextInput
+            label="Jenis Informasi"
+            placeholder="Masukkan jenis informasi"
             value={formData.jenisInformasi}
-            label={<Text fz={"sm"} fw={"bold"}>Jenis Informasi</Text>}
-            placeholder="masukkan jenis informasi"
             onChange={(val) => {
               setFormData({
                 ...formData,
                 jenisInformasi: val.target.value
-              })
+              });
             }}
+            required
           />
+
           <Box>
-            <Text fz={"sm"} fw={"bold"}>Deskripsi</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi
+            </Text>
             <EditEditor
               value={formData.deskripsi}
               onChange={(htmlContent) => {
@@ -103,19 +119,35 @@ function EditDaftarInformasiPublik() {
               }}
             />
           </Box>
+
           <TextInput
-            type='date'
+            type="date"
+            label="Tanggal Publikasi"
+            placeholder="Pilih tanggal publikasi"
             value={formatDateForInput(formData.tanggal)}
-            label={<Text fz={"sm"} fw={"bold"}>Tanggal Publikasi</Text>}
-            placeholder="masukkan tanggal publikasi"
             onChange={(val) => {
               setFormData({
                 ...formData,
                 tanggal: val.target.value
-              })
+              });
             }}
+            required
           />
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Edit Berita</Button>
+
+          <Group justify="right" mt="md">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan Perubahan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/page.tsx b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/page.tsx
index c848bb14..dab10166 100644
--- a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/[id]/page.tsx
@@ -1,13 +1,13 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from '@mantine/core';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { Box, Button, Group, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
+import { useShallowEffect } from '@mantine/hooks';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import daftarInformasiPublik from '../../../_state/ppid/daftar_informasi_publik/daftarInformasiPublik';
-import { useShallowEffect } from '@mantine/hooks';
 
 function DetailDaftarInformasiPublik() {
   const [modalHapus, setModalHapus] = useState(false)
@@ -31,76 +31,105 @@ function DetailDaftarInformasiPublik() {
 
   if (!stateDaftarInformasi.findUnique.data) {
     return (
-      <Stack>
-        <Skeleton h={500} />
+      <Stack py={10}>
+        <Skeleton height={500} radius="md" />
       </Stack>
     )
   }
 
+  const data = stateDaftarInformasi.findUnique.data;
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Berita</Text>
-          {stateDaftarInformasi.findUnique.data ? (
-            <Paper key={stateDaftarInformasi.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Jenis Informasi</Text>
-                  <Text fz={"lg"}>{stateDaftarInformasi.findUnique.data?.jenisInformasi}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Tanggal</Text>
-                  <Text fz={"lg"}>{stateDaftarInformasi.findUnique.data?.tanggal
-                    ? new Date(stateDaftarInformasi.findUnique.data.tanggal).toLocaleDateString()
-                    : "-"}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: stateDaftarInformasi.findUnique.data?.deskripsi }} />
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+    <Box py="md">
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '60%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="xl">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Informasi Publik
+          </Text>
+
+          <Paper bg="#f8f9fa" p="md" radius="md" shadow="xs">
+            <Stack gap="lg">
+              <Box>
+                <Text fz="lg" fw="bold" mb={4}>Jenis Informasi</Text>
+                <Text fz="md" c="dimmed">{data.jenisInformasi || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold" mb={4}>Tanggal Publikasi</Text>
+                <Text fz="md" c="dimmed">
+                  {data.tanggal ? new Date(data.tanggal).toLocaleDateString('id-ID', {
+                    day: '2-digit',
+                    month: 'long',
+                    year: 'numeric'
+                  }) : '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold" mb={4}>Deskripsi</Text>
+                <Box 
+                  fz="md" 
+                  c="dimmed" 
+                  dangerouslySetInnerHTML={{ __html: data.deskripsi || '-' }}
+                  className="prose max-w-none"
+                />
+              </Box>
+
+              <Group gap="sm" mt="md">
+                <Tooltip label="Edit Informasi" withArrow position="top">
                   <Button
-                    onClick={() => {
-                      if (stateDaftarInformasi.findUnique.data) {
-                        setSelectedId(stateDaftarInformasi.findUnique.data.id);
-                        setModalHapus(true);
-                      }
-                    }}
-                    disabled={stateDaftarInformasi.delete.loading || !stateDaftarInformasi.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    color="green"
+                    leftSection={<IconEdit size={18} />}
+                    onClick={() => router.push(`/admin/ppid/daftar-informasi-publik-desa-darmasaba/${data.id}/edit`)}
+                    disabled={!data}
                   >
-                    <IconX size={20} />
+                    Edit
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Hapus Informasi" withArrow position="top">
                   <Button
+                    variant="light"
+                    color="red"
+                    leftSection={<IconTrash size={18} />}
                     onClick={() => {
-                      if (stateDaftarInformasi.findUnique.data) {
-                        router.push(`/admin/ppid/daftar-informasi-publik-desa-darmasaba/${stateDaftarInformasi.findUnique.data.id}/edit`);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                     }}
-                    disabled={!stateDaftarInformasi.findUnique.data}
-                    color={"green"}
+                    disabled={stateDaftarInformasi.delete.loading || !data}
+                    loading={stateDaftarInformasi.delete.loading}
                   >
-                    <IconEdit size={20} />
+                    Hapus
                   </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
         </Stack>
       </Paper>
 
-      {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus berita ini?'
+        text='Apakah Anda yakin ingin menghapus informasi ini? Tindakan ini tidak dapat dibatalkan.'
       />
     </Box>
   );
diff --git a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/create/page.tsx b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/create/page.tsx
index 2e859e31..626f0020 100644
--- a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/create/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/create/page.tsx
@@ -1,70 +1,124 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 import CreateEditor from '../../../_com/createEditor';
 import daftarInformasiPublik from '../../../_state/ppid/daftar_informasi_publik/daftarInformasiPublik';
 
-export default function CreateBerita() {
-  const daftarInformasi = useProxy(daftarInformasiPublik)
-  const router = useRouter()
+export default function CreateDaftarInformasi() {
+  const daftarInformasi = useProxy(daftarInformasiPublik);
+  const router = useRouter();
 
   const resetForm = () => {
-    // Reset state di valtio
     daftarInformasi.create.form = {
       jenisInformasi: "",
       deskripsi: "",
       tanggal: "",
     };
-
-    // Reset state lokal
   };
 
   const handleSubmit = async () => {
-    // Submit data berita
-    await daftarInformasi.create.create();
+    if (!daftarInformasi.create.form.jenisInformasi) {
+      return alert('Mohon isi jenis informasi');
+    }
+    if (!daftarInformasi.create.form.deskripsi) {
+      return alert('Mohon isi deskripsi');
+    }
+    if (!daftarInformasi.create.form.tanggal) {
+      return alert('Mohon pilih tanggal publikasi');
+    }
 
-    // Reset form setelah submit
-    resetForm();
-    router.push("/admin/ppid/daftar-informasi-publik-desa-darmasaba")
+    try {
+      await daftarInformasi.create.create();
+      resetForm();
+      router.push("/admin/ppid/daftar-informasi-publik-desa-darmasaba");
+    } catch (error) {
+      console.error('Error creating informasi publik:', error);
+      alert('Terjadi kesalahan saat menyimpan data');
+    }
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Create Daftar Informasi Publik Desa Darmasaba</Title>
-          <TextInput
-            label={<Text fz={"sm"} fw={"bold"}>Jenis Informasi</Text>}
-            placeholder="masukkan jenis informasi"
-            onChange={(val) => {
-              daftarInformasi.create.form.jenisInformasi = val.target.value
-            }}
-          />
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Informasi Publik
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="xl">
           <Box>
-            <Text fz={"sm"} fw={"bold"}>Deskripsi</Text>
-            <CreateEditor
-              value={daftarInformasi.create.form.deskripsi}
-              onChange={(htmlContent) => {
-                daftarInformasi.create.form.deskripsi = htmlContent;
+            <Text fw="bold" fz="sm" mb={6}>
+              Jenis Informasi
+            </Text>
+            <TextInput
+              placeholder="Contoh: Profil Desa, Laporan Keuangan, dll"
+              value={daftarInformasi.create.form.jenisInformasi}
+              onChange={(e) => {
+                daftarInformasi.create.form.jenisInformasi = e.target.value;
               }}
+              required
             />
           </Box>
-          <TextInput
-            label={<Text fz={"sm"} fw={"bold"}>Tanggal Publikasi</Text>}
-            type="date"
-            placeholder="Contoh: 2022-01-01"
-            value={daftarInformasi.create.form.tanggal}
-            onChange={(e) => (daftarInformasi.create.form.tanggal = e.currentTarget.value)}
-          />
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Simpan</Button>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi
+            </Text>
+            <Box style={{ border: '1px solid #dee2e6', borderRadius: '0.25rem' }}>
+              <CreateEditor
+                value={daftarInformasi.create.form.deskripsi}
+                onChange={(htmlContent) => {
+                  daftarInformasi.create.form.deskripsi = htmlContent;
+                }}
+              />
+            </Box>
+          </Box>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Tanggal Publikasi
+            </Text>
+            <TextInput
+              type="date"
+              value={daftarInformasi.create.form.tanggal}
+              onChange={(e) => {
+                daftarInformasi.create.form.tanggal = e.target.value;
+              }}
+              required
+            />
+          </Box>
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={handleSubmit}
+              loading={daftarInformasi.create.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/page.tsx b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/page.tsx
index c09be478..41b4f398 100644
--- a/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/daftar-informasi-publik-desa-darmasaba/page.tsx
@@ -1,13 +1,12 @@
-/* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
-import { IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
+import { IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
+import { useShallowEffect, useViewportSize } from '@mantine/hooks';
+import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../_com/header';
-import JudulList from '../../_com/judulList';
 import daftarInformasiPublik from '../../_state/ppid/daftar_informasi_publik/daftarInformasiPublik';
 
 function DaftarInformasiPublik() {
@@ -16,7 +15,7 @@ function DaftarInformasiPublik() {
     <Box>
       <HeaderSearch
         title='Daftar Informasi Publik Desa Darmasaba'
-        placeholder='pencarian'
+        placeholder='Cari jenis informasi atau deskripsi...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -31,115 +30,118 @@ function ListDaftarInformasi({ search }: { search: string }) {
   const router = useRouter()
 
   const { data, page, totalPages, loading, load } = listData.findMany
+  const { width } = useViewportSize()
+  const isMobile = width < 768
 
-  useEffect(() => {
-    load(page, 10)
-  }, [page])
+  useShallowEffect(() => {
+    load(page, 10, search)
+  }, [page, search])
 
-
-  const filteredData = (data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.jenisInformasi.toLowerCase().includes(keyword) ||
-      item.deskripsi.toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || []
 
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton height={790} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    );
-  }
-  if (data.length === 0) {
-    return (
-      <Box py={10}>
-        <Paper p="md" >
-          <Stack>
-            <JudulList
-              title='List Daftar Informasi Publik Desa Darmasaba'
-              href='/admin/ppid/daftar-informasi-publik-desa-darmasaba/create'
-            />
-            <Table striped withTableBorder withRowBorders>
-              <TableThead>
-                <TableTr>
-                  <TableTh>No</TableTh>
-                  <TableTh>Jenis Informasi</TableTh>
-                  <TableTh>Deskripsi</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-            </Table>
-            <Text ta="center">Tidak ada data daftar informasi publik yang tersedia</Text>
-          </Stack>
-        </Paper>
-      </Box >
-    );
+    )
   }
 
   return (
-    <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'} h={{ base: 870, md: 790 }}>
-        <Stack>
-          <JudulList
-            title='List Daftar Informasi Publik Desa Darmasaba'
-            href='/admin/ppid/daftar-informasi-publik-desa-darmasaba/create'
-          />
-          <Box style={{ overflowX: "auto" }}>
+    <Box py="md">
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Informasi Publik</Title>
+          <Tooltip label="Tambah Informasi Publik" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/ppid/daftar-informasi-publik-desa-darmasaba/create')}
+            >
+              {isMobile ? 'Tambah' : 'Tambah Baru'}
+            </Button>
+          </Tooltip>
+        </Group>
+
+        {filteredData.length === 0 ? (
+          <Stack align="center" py="xl">
+            <IconDeviceImacCog size={40} stroke={1.5} color={colors['blue-button']} />
+            <Text fw={500} c="dimmed">Belum ada informasi publik yang tersedia</Text>
+          </Stack>
+        ) : (
+          <Box style={{ overflowX: 'auto' }}>
             <Table
-              striped
+              highlightOnHover
               withTableBorder
-              withRowBorders
-              bg={colors['white-1']}
+              withColumnBorders
+              striped
+              stickyHeader
               style={{ minWidth: '700px' }}
             >
               <TableThead>
                 <TableTr>
                   <TableTh style={{ width: '5%', textAlign: 'center' }}>No</TableTh>
-                  <TableTh style={{ width: '20%' }}>Jenis Informasi</TableTh>
-                  <TableTh style={{ width: '50%' }}>Deskripsi</TableTh>
-                  <TableTh style={{ width: '15%', textAlign: 'center' }}>Detail</TableTh>
+                  <TableTh style={{ width: '25%' }}>Jenis Informasi</TableTh>
+                  <TableTh style={{ width: '60%' }}>Deskripsi</TableTh>
+                  <TableTh style={{ width: '10%', textAlign: 'center' }}>Aksi</TableTh>
                 </TableTr>
               </TableThead>
               <TableTbody>
                 {filteredData.map((item, index) => (
                   <TableTr key={item.id}>
                     <TableTd style={{ textAlign: 'center' }}>
-                      <Text mt={10} fz={"md"}>{index + 1}</Text>
+                      <Text fz="sm">{(page - 1) * 10 + index + 1}</Text>
                     </TableTd>
-                    <TableTd style={{ wordWrap: 'break-word' }}>
-                      <Box w={200}>
-                        <Text mt={10} fz={"md"} truncate={"end"} lineClamp={1}>{item.jenisInformasi}</Text>
-                      </Box>
+                    <TableTd>
+                      <Tooltip label={item.jenisInformasi} position="top-start" openDelay={500}>
+                        <Text fw={500} lineClamp={1}>{item.jenisInformasi}</Text>
+                      </Tooltip>
                     </TableTd>
-                    <TableTd style={{ wordWrap: 'break-word' }}>
-                      <Box w={200}>
-                        <Text fz={"md"} truncate={"end"} lineClamp={1} dangerouslySetInnerHTML={{ __html: item.deskripsi }}></Text>
-                      </Box>
+                    <TableTd>
+                      <Tooltip
+                        label={item.deskripsi?.replace(/<[^>]*>?/gm, '')}
+                        position="top-start"
+                        openDelay={500}
+                        multiline
+                        maw={400}
+                      >
+                        <Text lineClamp={1} fz="sm" c="dimmed">
+                          {item.deskripsi?.replace(/<[^>]*>?/gm, '').substring(0, 80) + '...'}
+                        </Text>
+                      </Tooltip>
                     </TableTd>
                     <TableTd style={{ textAlign: 'center' }}>
-                      <Button bg={"green"} onClick={() => router.push(`/admin/ppid/daftar-informasi-publik-desa-darmasaba/${item.id}`)}>
-                        <IconDeviceImacCog size={25} />
-                      </Button>
+                      <Tooltip label="Lihat Detail" withArrow>
+                        <Button
+                          variant="light"
+                          color="blue"
+                          size="sm"
+                          onClick={() => router.push(`/admin/ppid/daftar-informasi-publik-desa-darmasaba/${item.id}`)}
+                        >
+                          <IconDeviceImacCog size={20} />
+                        </Button>
+                      </Tooltip>
                     </TableTd>
                   </TableTr>
                 ))}
               </TableTbody>
             </Table>
           </Box>
-        </Stack>
+        )}
       </Paper>
-      <Center>
+      <Center mt="lg">
         <Pagination
           value={page}
           onChange={(newPage) => {
             load(newPage, 10);
-            window.scrollTo(0, 0);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
           }}
           total={totalPages}
           mt="md"
           mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
     </Box>
diff --git a/src/app/admin/(dashboard)/ppid/dasar-hukum/edit/page.tsx b/src/app/admin/(dashboard)/ppid/dasar-hukum/edit/page.tsx
index 3db09f04..5ca62fce 100644
--- a/src/app/admin/(dashboard)/ppid/dasar-hukum/edit/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/dasar-hukum/edit/page.tsx
@@ -1,6 +1,6 @@
-'use client'
+'use client';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import dynamic from 'next/dynamic';
 import { useEffect, useState } from 'react';
@@ -41,45 +41,70 @@ function EditDasarHukum() {
     router.push('/admin/ppid/dasar-hukum')
   }
   return (
-    <Box>
-      <Stack gap={'xs'}>
-        <Box>
-          <Button
-            variant={'subtle'}
-            onClick={() => router.back()}
-          >
-            <IconArrowBack color={colors['blue-button']} size={20} />
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
-        </Box>
-        <Box>
-          <Paper bg={colors['white-1']} p={'md'} radius={10} w={{ base: '100%', md: '50%' }}>
-            <Stack gap={'xs'}>
-              <Title order={3}>Edit Dasar Hukum PPID</Title>
-              <Text fw={"bold"}>Judul</Text>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Dasar Hukum PPID
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="xl">
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Judul
+            </Text>
+            <Box style={{ border: '1px solid #dee2e6', borderRadius: '0.25rem' }}>
               <PPIDTextEditor
                 showSubmit={false}
                 onChange={setJudul}
                 initialContent={judul}
               />
-              <Text fw={"bold"}>Content</Text>
+            </Box>
+          </Box>
+          
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Konten
+            </Text>
+            <Box style={{ border: '1px solid #dee2e6', borderRadius: '0.25rem' }}>
               <PPIDTextEditor
                 showSubmit={false}
                 onChange={setContent}
                 initialContent={content}
               />
-              <Group>
-                <Button
-                  bg={colors['blue-button']}
-                  onClick={submit}
-                  loading={dasarHukumState.update.loading}
-                >
-                  Submit
-                </Button>
-              </Group>
-            </Stack>
-          </Paper>
-        </Box>
-      </Stack>
+            </Box>
+          </Box>
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={submit}
+              loading={dasarHukumState.update.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
     </Box>
   );
 }
diff --git a/src/app/admin/(dashboard)/ppid/dasar-hukum/page.tsx b/src/app/admin/(dashboard)/ppid/dasar-hukum/page.tsx
index 35be5294..6af53a65 100644
--- a/src/app/admin/(dashboard)/ppid/dasar-hukum/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/dasar-hukum/page.tsx
@@ -1,6 +1,6 @@
-'use client'
+'use client';
 import colors from '@/con/colors';
-import { Box, Button, Grid, GridCol, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
+import { Box, Button, Center, Divider, Grid, GridCol, Image, Paper, Skeleton, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconEdit } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -14,38 +14,78 @@ function Page() {
     listDasarHukum.findById.load('1')
   }, [])
 
+  if (listDasarHukum.findById.loading) {
+    return (
+      <Center py={40}>
+        <Skeleton radius="md" height={800} width="100%" />
+      </Center>
+    );
+  }
+
   if (!listDasarHukum.findById.data) {
     return (
-      <Stack>
-        <Skeleton radius={10} h={800} />
-      </Stack>
-    )
+      <Center py={60}>
+        <Stack align="center" gap="sm">
+          <Text fw={500} c="dimmed">Belum ada data dasar hukum PPID</Text>
+        </Stack>
+      </Center>
+    );
   }
+
   return (
-    <Paper bg={colors['white-1']} p={'md'} radius={10}>
-      <Stack gap={"22"}>
-        <Grid>
+    <Paper bg={colors['white-1']} p="lg" radius="md" shadow="sm">
+      <Stack gap="md">
+        <Grid align="center">
           <GridCol span={{ base: 12, md: 11 }}>
-            <Title order={2}>Preview Dasar Hukum PPID</Title>
+            <Title order={3} c={colors['blue-button']}>Preview Dasar Hukum PPID</Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 1 }}>
-            <Button bg={colors['blue-button']} onClick={() => router.push('/admin/ppid/dasar-hukum/edit')}>
-              <IconEdit size={16} />
-            </Button>
+            <Tooltip label="Edit Dasar Hukum" withArrow>
+              <Button
+                c="green"
+                variant="light"
+                leftSection={<IconEdit size={18} stroke={2} />}
+                radius="md"
+                onClick={() => router.push('/admin/ppid/dasar-hukum/edit')}
+              >
+                Edit
+              </Button>
+            </Tooltip>
           </GridCol>
         </Grid>
-        <Box>
-          <Stack gap={'lg'}>
-            <Paper p={"xl"} bg={colors['BG-trans']}>
-              <Box px={{ base: 0, md: 30 }}>
-                <Text ta={"center"} fz={{ base: "h3", md: "h2" }} fw={"bold"} dangerouslySetInnerHTML={{ __html: listDasarHukum.findById.data.judul }} />
-              </Box>
-              <Box px={{ base: 0, md: 30 }}>
-                <Text fz={{ base: "md", md: "h3" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: listDasarHukum.findById.data.content }} />
-              </Box>
-            </Paper>
-          </Stack>
-        </Box>
+
+        <Paper p="xl" bg={'white'} withBorder radius="md" shadow="xs">
+          <Box px={{ base: 'sm', md: 100 }}>
+            <Grid>
+              <GridCol span={12}>
+                <Center>
+                  <Image src="/darmasaba-icon.png" w={{ base: 100, md: 150 }} alt="Logo PPID" />
+                </Center>
+              </GridCol>
+              <GridCol span={12}>
+                <Text 
+                  ta="center" 
+                  fz={{ base: '1.5rem', md: '2rem' }} 
+                  fw="bold" 
+                  c={colors['blue-button']}
+                  dangerouslySetInnerHTML={{ __html: listDasarHukum.findById.data.judul }} 
+                />
+              </GridCol>
+            </Grid>
+
+            <Divider my="xl" color={colors['blue-button']} />
+
+            <Box 
+              className="prose max-w-none"
+              dangerouslySetInnerHTML={{ __html: listDasarHukum.findById.data.content }}
+              style={{
+                fontSize: '1.1rem',
+                lineHeight: 1.7,
+                textAlign: 'justify'
+              }}
+            />
+          </Box>
+        </Paper>
       </Stack>
     </Paper>
   )
diff --git a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/_lib/layoutTabs.tsx b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/_lib/layoutTabs.tsx
index fc16deb2..56740f26 100644
--- a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/_lib/layoutTabs.tsx
+++ b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/_lib/layoutTabs.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
-import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+'use client';
+import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
+import { IconChartBar, IconUsers } from '@tabler/icons-react';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
 
@@ -11,15 +11,18 @@ function LayoutTabsIKM({ children }: { children: React.ReactNode }) {
     const tabs = [
         {
             label: "Indeks Kepuasan Masyarakat",
+            description: "Lihat dan kelola indeks kepuasan masyarakat",
             value: "indekskepuasannamasyarakat",
-            href: "/admin/ppid/ikm-desa-darmasaba/indeks-kepuasan-masyarakat"
+            href: "/admin/ppid/ikm-desa-darmasaba/indeks-kepuasan-masyarakat",
+            icon: <IconChartBar size={18} stroke={1.8} />
         },
         {
             label: "Responden",
+            description: "Kelola dan tinjau data responden",
             value: "responden",
-            href: "/admin/ppid/ikm-desa-darmasaba/responden"
+            href: "/admin/ppid/ikm-desa-darmasaba/responden",
+            icon: <IconUsers size={18} stroke={1.8} />
         },
-        
     ];
     const curentTab = tabs.find(tab => tab.href === pathname)
     const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
@@ -40,16 +43,48 @@ function LayoutTabsIKM({ children }: { children: React.ReactNode }) {
     }, [pathname])
 
     return (
-        <Stack>
-            <Title order={3}>IKM Desa Darmasaba</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
+        <Stack gap="lg">
+            <Title order={2} style={{ fontWeight: 700, color: "#1a1a1a" }}>
+                IKM Desa Darmasaba
+            </Title>
+            <Tabs
+                radius="xl"
+                color="blue"
+                variant="pills"
+                value={activeTab}
+                onChange={handleTabChange}
+            >
+                <TabsList
+                    p="sm"
+                    style={{
+                        background: "#F3F4FB",
+                        borderRadius: "1rem",
+                    }}
+                >
                     {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
+                        <Tooltip 
+                            key={i} 
+                            label={e.description} 
+                            withArrow 
+                            position="bottom" 
+                            transitionProps={{ transition: 'pop', duration: 200 }}
+                        >
+                            <TabsTab
+                                value={e.value}
+                                leftSection={e.icon}
+                                style={{
+                                    fontWeight: 500,
+                                    fontSize: "0.9rem",
+                                    transition: "all 0.2s ease",
+                                }}
+                            >
+                                {e.label}
+                            </TabsTab>
+                        </Tooltip>
                     ))}
                 </TabsList>
                 {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
+                    <TabsPanel key={i} value={e.value} mt="md">
                         {/* Konten dummy, bisa diganti tergantung routing */}
                         <></>
                     </TabsPanel>
diff --git a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/indeks-kepuasan-masyarakat/page.tsx b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/indeks-kepuasan-masyarakat/page.tsx
index 6bb6d463..63d2894c 100644
--- a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/indeks-kepuasan-masyarakat/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/indeks-kepuasan-masyarakat/page.tsx
@@ -116,28 +116,27 @@ function Page() {
 
   if (loading || !data) {
     return (
-      <Stack py={10}>
-        <Skeleton height={730} />
+      <Stack py="xl">
+        <Skeleton height={750} radius="lg" />
       </Stack>
     );
   }
 
   if (data.length === 0) {
     return (
-      <Stack py={10}>
-        <Text c="dimmed" ta="center" my="md">
-          Belum ada data untuk ditampilkan
+      <Stack py="xl">
+        <Text c="dimmed" ta="center" size="lg">
+          Belum ada data yang tersedia
         </Text>
       </Stack>
     );
   }
 
   return (
-    <Stack gap="xs">
-      {/* Bar Chart - Data per Tanggal */}
-      <Paper bg={colors['white-1']} p="md" radius="md" mb="md">
-        <Title order={4} mb="md" ta="center">Jumlah Responden per Bulan</Title>
-        <Box h={300}>
+    <Stack gap="lg">
+      <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
+        <Title order={3} mb="md" ta="center">Tren Jumlah Responden</Title>
+        <Box h={320}>
           <BarChart
             h={300}
             data={barChartData}
@@ -152,14 +151,13 @@ function Page() {
         </Box>
       </Paper>
 
-      <SimpleGrid cols={{ base: 1, md: 3 }}>
-        {/* Chart Jenis Kelamin */}
-        <Paper bg={colors['white-1']} p="md" radius="md">
+      <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+        <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
           <Stack>
-            <Title order={4}>Jenis Kelamin</Title>
+            <Title order={4} ta="center">Distribusi Jenis Kelamin</Title>
             {donutDataJenisKelamin.every(item => item.value === 0) ? (
               <Text c="dimmed" ta="center" my="md">
-                Belum ada data untuk ditampilkan dalam grafik
+                Tidak ada data
               </Text>
             ) : (
               <Box>
@@ -168,15 +166,15 @@ function Page() {
                     withLabels
                     withTooltip
                     labelsType="percent"
-                    size={250}
+                    size={220}
                     data={donutDataJenisKelamin}
                   />
                 </Center>
-                <Stack gap="sm" mt="md">
+                <Stack gap="xs" mt="md">
                   {donutDataJenisKelamin.map((entry) => (
-                    <Flex key={entry.name} gap="md" align="center">
-                      <Box bg={entry.color} w={20} h={20} style={{ flexShrink: 0 }} />
-                      <Text size="sm">{entry.name}: {entry.value}</Text>
+                    <Flex key={entry.name} gap="sm" align="center">
+                      <Box bg={entry.color} w={14} h={14} style={{ borderRadius: 4, flexShrink: 0 }} />
+                      <Text size="sm" fw={500}>{entry.name}: {entry.value}</Text>
                     </Flex>
                   ))}
                 </Stack>
@@ -185,13 +183,12 @@ function Page() {
           </Stack>
         </Paper>
 
-        {/* Chart Rating */}
-        <Paper bg={colors['white-1']} p="md" radius="md">
+        <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
           <Stack>
-            <Title order={4}>Pilihan</Title>
+            <Title order={4} ta="center">Distribusi Penilaian</Title>
             {donutDataRating.every(item => item.value === 0) ? (
               <Text c="dimmed" ta="center" my="md">
-                Belum ada data untuk ditampilkan dalam grafik
+                Tidak ada data
               </Text>
             ) : (
               <Box>
@@ -200,15 +197,15 @@ function Page() {
                     withLabels
                     withTooltip
                     labelsType="percent"
-                    size={250}
+                    size={220}
                     data={donutDataRating}
                   />
                 </Center>
-                <Stack gap="sm" mt="md">
+                <Stack gap="xs" mt="md">
                   {donutDataRating.map((entry) => (
-                    <Flex key={entry.name} gap="md" align="center">
-                      <Box bg={entry.color} w={20} h={20} style={{ flexShrink: 0 }} />
-                      <Text size="sm">{entry.name}: {entry.value}</Text>
+                    <Flex key={entry.name} gap="sm" align="center">
+                      <Box bg={entry.color} w={14} h={14} style={{ borderRadius: 4, flexShrink: 0 }} />
+                      <Text size="sm" fw={500}>{entry.name}: {entry.value}</Text>
                     </Flex>
                   ))}
                 </Stack>
@@ -217,13 +214,12 @@ function Page() {
           </Stack>
         </Paper>
 
-        {/* Chart Kelompok Umur */}
-        <Paper bg={colors['white-1']} p="md" radius="md">
+        <Paper withBorder bg={colors['white-1']} p="lg" radius="xl" shadow="sm">
           <Stack>
-            <Title order={4}>Umur</Title>
+            <Title order={4} ta="center">Distribusi Kelompok Umur</Title>
             {donutDataKelompokUmur.every(item => item.value === 0) ? (
               <Text c="dimmed" ta="center" my="md">
-                Belum ada data untuk ditampilkan dalam grafik
+                Tidak ada data
               </Text>
             ) : (
               <Box>
@@ -232,15 +228,15 @@ function Page() {
                     withLabels
                     withTooltip
                     labelsType="percent"
-                    size={250}
+                    size={220}
                     data={donutDataKelompokUmur}
                   />
                 </Center>
-                <Stack gap="sm" mt="md">
+                <Stack gap="xs" mt="md">
                   {donutDataKelompokUmur.map((entry) => (
-                    <Flex key={entry.name} gap="md" align="center">
-                      <Box bg={entry.color} w={20} h={20} style={{ flexShrink: 0 }} />
-                      <Text size="sm">{entry.name}: {entry.value}</Text>
+                    <Flex key={entry.name} gap="sm" align="center">
+                      <Box bg={entry.color} w={14} h={14} style={{ borderRadius: 4, flexShrink: 0 }} />
+                      <Text size="sm" fw={500}>{entry.name}: {entry.value}</Text>
                     </Flex>
                   ))}
                 </Stack>
diff --git a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/edit/page.tsx b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/edit/page.tsx
index 7d9f6e55..2be25c2d 100644
--- a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/edit/page.tsx
@@ -4,8 +4,8 @@ import React, { useEffect, useState } from 'react';
 import { useRouter, useParams } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Title, TextInput, Text, Select } from '@mantine/core';
-import { IconArrowBack } from '@tabler/icons-react';
+import { Box, Button, Group, Paper, Stack, Title, TextInput, Text, Select, Tooltip } from '@mantine/core';
+import { IconArrowBack, IconDeviceFloppy } from '@tabler/icons-react';
 import indeksKepuasanState from '@/app/admin/(dashboard)/_state/landing-page/indeks-kepuasan';
 import { toast } from 'react-toastify';
 
@@ -78,19 +78,35 @@ function EditResponden() {
   }
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack size={20} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
-        <Stack>
-          <Title order={3}>Edit Responden</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Responden
+        </Title>
+      </Group>
+
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
           <TextInput
-            label="Nama"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Nama Responden
+              </Text>
+            }
             type='text'
-            placeholder="masukkan nama"
+            placeholder="Masukkan nama responden"
             value={formData.name}
             onChange={(val) => {
               setFormData({
@@ -98,9 +114,15 @@ function EditResponden() {
                 name: val.currentTarget.value
               })
             }}
+            radius="md"
+            required
           />
           <TextInput
-            label="Tanggal"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Tanggal
+              </Text>
+            }
             type="date"
             placeholder='Pilih tanggal'
             value={formData.tanggal ? new Date(formData.tanggal).toISOString().split('T')[0] : ''}
@@ -111,32 +133,43 @@ function EditResponden() {
                 tanggal: selectedDate,
               });
             }}
+            radius="md"
+            required
           />
           <Select
-            key={"jenisKelamin"}
-            label={<Text fw="bold" fz="sm">Jenis Kelamin</Text>}
+            key="jenisKelamin"
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Jenis Kelamin
+              </Text>
+            }
             placeholder="Pilih jenis kelamin"
             value={formData.jenisKelaminId}
             onChange={(val) => setFormData({ ...formData, jenisKelaminId: val || "" })}
             data={
               (indeksKepuasanState.jenisKelaminResponden.findMany.data || [])
-                .filter(Boolean) // Hapus null/undefined
+                .filter(Boolean)
                 .map((v) => ({
                   value: v.id || '',
                   label: typeof v.name === 'string' ? v.name : 'Tanpa Nama'
                 }))
             }
-            disabled={indeksKepuasanState.jenisKelaminResponden.findMany.loading} // ✅ disable saat loading
+            disabled={indeksKepuasanState.jenisKelaminResponden.findMany.loading}
             clearable
             searchable
             required
+            radius="md"
             error={!formData.jenisKelaminId ? "Pilih jenis kelamin" : undefined}
           />
           <Select
-            key={"rating"}
+            key="rating"
             value={formData.ratingId}
             onChange={(val) => setFormData({ ...formData, ratingId: val || "" })}
-            label={<Text fw={"bold"} fz={"sm"}>Rating</Text>}
+            label={
+              <Text fw="bold" fz="sm" mb={4}>
+                Rating
+              </Text>
+            }
             placeholder='Pilih rating'
             data={
               (indeksKepuasanState.pilihanRatingResponden.findMany.data || [])
@@ -150,6 +183,7 @@ function EditResponden() {
             clearable
             searchable
             required
+            radius="md"
             error={!formData.ratingId ? "Pilih rating" : undefined}
           />
 
@@ -173,14 +207,24 @@ function EditResponden() {
             required
             error={!formData.kelompokUmurId ? "Pilih kelompok umur" : undefined}
           />
-
-          <Button
-            mt={10}
-            bg={colors['blue-button']}
-            onClick={handleSubmit}
-          >
-            Submit
-          </Button>
+          
+          <Group justify="flex-end" mt="md">
+            <Button 
+              variant="light" 
+              color="red" 
+              onClick={() => router.back()}
+            >
+              Batal
+            </Button>
+            <Button 
+              leftSection={<IconDeviceFloppy size={20} />}
+              onClick={handleSubmit} 
+              loading={state.update.loading}
+              color={colors['blue-button']}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/page.tsx b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/page.tsx
index 08849a58..5f132b8a 100644
--- a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/[id]/page.tsx
@@ -3,10 +3,10 @@
 import { ModalKonfirmasiHapus } from "@/app/admin/(dashboard)/_com/modalKonfirmasiHapus"
 import indeksKepuasanState from "@/app/admin/(dashboard)/_state/landing-page/indeks-kepuasan"
 import colors from "@/con/colors"
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from "@mantine/core"
+import { Box, Button, Group, Paper, Skeleton, Stack, Text, Tooltip } from "@mantine/core"
 import { useShallowEffect } from "@mantine/hooks"
-import { IconArrowBack, IconEdit, IconX } from "@tabler/icons-react"
-import { useRouter, useParams } from "next/navigation"
+import { IconArrowBack, IconEdit, IconTrash } from "@tabler/icons-react"
+import { useParams, useRouter } from "next/navigation"
 import { useState } from "react"
 import { useProxy } from "valtio/utils"
 
@@ -38,67 +38,89 @@ export default function DetailResponden() {
     )
   }
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper w={{ base: "100%", md: "50%" }} bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Responden</Text>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
 
-          <Paper bg={colors['BG-trans']} p={'md'}>
-            <Stack gap={"xs"}>
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "60%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Responden
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Nama Responden</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.name}</Text>
+                <Text fz="lg" fw="bold">Nama Responden</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.name || '-'}</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Tanggal</Text>
-                <Text fz={"lg"}>{
+                <Text fz="lg" fw="bold">Tanggal</Text>
+                <Text fz="md" c="dimmed">{
                   stateDetail.findUnique.data?.tanggal
                     ? new Date(stateDetail.findUnique.data.tanggal).toLocaleDateString('id-ID')
                     : '-'
                 }</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Jenis Kelamin</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.jenisKelamin?.name}</Text>
+                <Text fz="lg" fw="bold">Jenis Kelamin</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.jenisKelamin?.name || '-'}</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Rating</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.rating?.name}</Text>
+                <Text fz="lg" fw="bold">Rating</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.rating?.name || '-'}</Text>
               </Box>
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Kelompok Umur</Text>
-                <Text fz={"lg"}>{stateDetail.findUnique.data?.kelompokUmur?.name}</Text>
+                <Text fz="lg" fw="bold">Kelompok Umur</Text>
+                <Text fz="md" c="dimmed">{stateDetail.findUnique.data?.kelompokUmur?.name || '-'}</Text>
               </Box>
-              <Flex gap={"xs"} mt={10}>
-                <Button
-                  onClick={() => {
-                    if (stateDetail.findUnique.data) {
-                      setSelectedId(stateDetail.findUnique.data.id);
-                      setModalHapus(true);
-                    }
-                  }}
-                  disabled={stateDetail.delete.loading || !stateDetail.findUnique.data}
-                  color={"red"}
-                >
-                  <IconX size={20} />
-                </Button>
-                <Button
-                  onClick={() => {
-                    if (stateDetail.findUnique.data) {
-                      router.push(`/admin/ppid/ikm-desa-darmasaba/responden/${stateDetail.findUnique.data.id}/edit`);
-                    }
-                  }}
-                  disabled={!stateDetail.findUnique.data}
-                  color={"green"}
-                >
-                  <IconEdit size={20} />
-                </Button>
-              </Flex>
+              
+              <Group gap="sm" mt="md">
+                <Tooltip label="Hapus Responden" withArrow position="top">
+                  <Button
+                    color="red"
+                    variant="light"
+                    onClick={() => {
+                      if (stateDetail.findUnique.data) {
+                        setSelectedId(stateDetail.findUnique.data.id);
+                        setModalHapus(true);
+                      }
+                    }}
+                    disabled={stateDetail.delete.loading || !stateDetail.findUnique.data}
+                    leftSection={<IconTrash size={20} />}
+                  >
+                    Hapus
+                  </Button>
+                </Tooltip>
+                <Tooltip label="Edit Responden" withArrow position="top">
+                  <Button
+                    color="green"
+                    variant="light"
+                    onClick={() => {
+                      if (stateDetail.findUnique.data) {
+                        router.push(`/admin/ppid/ikm-desa-darmasaba/responden/${stateDetail.findUnique.data.id}/edit`);
+                      }
+                    }}
+                    disabled={!stateDetail.findUnique.data}
+                    leftSection={<IconEdit size={20} />}
+                  >
+                    Edit
+                  </Button>
+                </Tooltip>
+              </Group>
             </Stack>
           </Paper>
         </Stack>
diff --git a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/page.tsx b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/page.tsx
index 511b05fd..ae7d00bc 100644
--- a/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/ikm-desa-darmasaba/responden/page.tsx
@@ -1,5 +1,4 @@
 'use client';
-import colors from '@/con/colors';
 import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
@@ -14,9 +13,9 @@ function Responden() {
   return (
     <Box>
       <HeaderSearch
-        title='Responden'
-        placeholder='pencarian'
-        searchIcon={<IconSearch size={20} />}
+        title="Data Responden"
+        placeholder="Cari nama responden..."
+        searchIcon={<IconSearch size={18} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
       />
@@ -49,93 +48,99 @@ function ListResponden({ search }: ListRespondenProps) {
 
   if (loading || !data) {
     return (
-      <Stack py={10}>
-        <Skeleton height={730} />
+      <Stack py="xl">
+        <Skeleton height={750} radius="lg" />
       </Stack>
     );
   }
+
   if (data.length === 0) {
     return (
-      <Box py={10}>
-        <Paper p="md">
-          <Stack>
-            <Title>Responden</Title>
-            <Table striped withTableBorder withRowBorders>
-              <TableThead>
-                <TableTr>
-                  <TableTh>No</TableTh>
-                  <TableTh>Nama</TableTh>
-                  <TableTh>Tanggal</TableTh>
-                  <TableTh>Jenis Kelamin</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-            </Table>
-            <Text ta="center">Tidak ada data berdasarkan jenis kelamin responden yang tersedia</Text>
-          </Stack>
-        </Paper>
-      </Box >
+      <Paper withBorder bg="white" p="lg" radius="md" shadow="sm">
+        <Stack gap="md">
+          <Title order={3}>Data Responden</Title>
+          <Table striped withTableBorder withRowBorders>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ textAlign: 'center' }}>No</TableTh>
+                <TableTh>Nama</TableTh>
+                <TableTh>Tanggal</TableTh>
+                <TableTh>Jenis Kelamin</TableTh>
+                <TableTh style={{ textAlign: 'center' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+          </Table>
+          <Text c="dimmed" ta="center" py="md">
+            Belum ada data responden yang tersedia
+          </Text>
+        </Stack>
+      </Paper>
     );
   }
 
   return (
-    <Box>
-      <Stack gap="xs">
-        <Paper bg={colors['white-1']} p="md" h={{ base: 730, md: 650 }}>
-          <Title mb={10} order={3}>List Responden</Title>
-          <Table striped withTableBorder withRowBorders>
-            <TableThead>
+    <Paper withBorder bg="white" p="lg" radius="md" shadow="sm">
+      <Stack gap="md">
+        <Title order={3}>Data Responden</Title>
+        <Table striped withTableBorder withRowBorders>
+          <TableThead>
+            <TableTr>
+              <TableTh style={{ width: '5%', textAlign: 'center' }}>No</TableTh>
+              <TableTh style={{ width: '25%' }}>Nama</TableTh>
+              <TableTh style={{ width: '25%' }}>Tanggal</TableTh>
+              <TableTh style={{ width: '20%' }}>Jenis Kelamin</TableTh>
+              <TableTh style={{ width: '15%', textAlign: 'center' }}>Aksi</TableTh>
+            </TableTr>
+          </TableThead>
+          <TableTbody>
+            {filteredData.length === 0 ? (
               <TableTr>
-                <TableTh style={{ width: '5%', textAlign: 'center' }}>No</TableTh>
-                <TableTh style={{ width: '20%', textAlign: 'center' }}>Nama</TableTh>
-                <TableTh style={{ width: '20%', textAlign: 'center' }}>Tanggal</TableTh>
-                <TableTh style={{ width: '20%', textAlign: 'center' }}>Jenis Kelamin</TableTh>
-                <TableTh style={{ width: '15%', textAlign: 'center' }}>Detail</TableTh>
+                <TableTd colSpan={5}>
+                  <Text c="dimmed" ta="center" py="md">
+                    Tidak ada data yang cocok dengan pencarian
+                  </Text>
+                </TableTd>
               </TableTr>
-            </TableThead>
-            <TableTbody>
-              {filteredData.length === 0 ? (
-                <TableTr>
-                  <TableTd colSpan={6}>
-                    <Text ta='center' c='dimmed'>Belum ada data responden</Text>
+            ) : (
+              filteredData.map((item, index) => (
+                <TableTr key={item.id}>
+                  <TableTd style={{ width: '5%', textAlign: 'center' }}>{index + 1}</TableTd>
+                  <TableTd style={{ width: '25%' }}>{item.name}</TableTd>
+                  <TableTd style={{ width: '25%' }}>
+                    {item.tanggal ? new Date(item.tanggal).toLocaleDateString('id-ID') : '-'}
+                  </TableTd>
+                  <TableTd style={{ width: '20%' }}>{item.jenisKelamin.name}</TableTd>
+                  <TableTd style={{ width: '15%', textAlign: 'center' }}>
+                    <Button
+                      variant="light"
+                      size="xs"
+                      onClick={() => router.push(`/admin/ppid/ikm-desa-darmasaba/responden/${item.id}`)}
+                    >
+                      <IconDeviceImac size={20} />
+                    </Button>
                   </TableTd>
                 </TableTr>
-              ) : (
-                filteredData.map((item, index) => (
-                  <TableTr key={item.id}>
-                    <TableTd style={{ width: '5%', textAlign: 'center' }}>{index + 1}</TableTd>
-                    <TableTd style={{ width: '20%', textAlign: 'center' }}>{item.name}</TableTd>
-                    <TableTd style={{ width: '20%', textAlign: 'center' }}>{item.tanggal
-                      ? new Date(item.tanggal).toLocaleDateString('id-ID')
-                      : '-'}</TableTd>
-                    <TableTd style={{ width: '20%', textAlign: 'center' }}>{item.jenisKelamin.name}</TableTd>
-                    <TableTd style={{ width: '15%', textAlign: 'center' }}>
-                      <Button color='green' onClick={() => router.push(`/admin/ppid/ikm-desa-darmasaba/responden/${item.id}`)}>
-                        <IconDeviceImac size={20} />
-                      </Button>
-                    </TableTd>
-                  </TableTr>
-                ))
-              )}
-            </TableTbody>
-          </Table>
-        </Paper>
-        <Center>
-          <Pagination
-            value={page}
-            onChange={(newPage) => {
-              load(newPage, 10);
-              window.scrollTo(0, 0);
-            }}
-            total={totalPages}
-            mt="md"
-            mb="md"
-          />
-        </Center>
-
-       
+              ))
+            )}
+          </TableTbody>
+        </Table>
+        {filteredData.length > 0 && (
+          <Center>
+            <Pagination
+              value={page}
+              total={totalPages}
+              onChange={(newPage) => {
+                load(newPage, 10);
+                window.scrollTo({ top: 0, behavior: 'smooth' });
+              }}
+              size="md"
+              radius="md"
+              mt="md"
+            />
+          </Center>
+        )}
       </Stack>
-    </Box>
+    </Paper>
   );
 }
 
diff --git a/src/app/admin/(dashboard)/ppid/permohonan-informasi-publik/page.tsx b/src/app/admin/(dashboard)/ppid/permohonan-informasi-publik/page.tsx
index 0f5559d7..9dd16103 100644
--- a/src/app/admin/(dashboard)/ppid/permohonan-informasi-publik/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/permohonan-informasi-publik/page.tsx
@@ -1,58 +1,104 @@
 'use client'
-import colors from '@/con/colors';
-import { Box, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Title } from '@mantine/core';
-import { useProxy } from 'valtio/utils';
-import { useShallowEffect } from '@mantine/hooks';
-import statepermohonanInformasiPublikForm from '../../_state/ppid/permohonan_informasi_publik/permohonanInformasiPublik';
+import { useProxy } from 'valtio/utils'
+import { useShallowEffect } from '@mantine/hooks'
+import { Box, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Title, Text, Group, Tooltip, Badge } from '@mantine/core'
+import { IconInfoCircle, IconUser, IconMail, IconPhone, IconId } from '@tabler/icons-react'
+import statepermohonanInformasiPublikForm from '../../_state/ppid/permohonan_informasi_publik/permohonanInformasiPublik'
+import colors from '@/con/colors'
 
 function Page() {
   const permohonanInformasiPublikState = useProxy(statepermohonanInformasiPublikForm)
+
   useShallowEffect(() => {
     permohonanInformasiPublikState.statepermohonanInformasiPublik.findMany.load()
   }, [])
-  if (!permohonanInformasiPublikState.statepermohonanInformasiPublik.findMany.data)
-    return <Stack pos={"relative"} bg={colors.Bg}>
-      <Skeleton radius={5} h={200} />
-    </Stack>
+
+  if (!permohonanInformasiPublikState.statepermohonanInformasiPublik.findMany.data) {
+    return (
+      <Stack pos="relative" bg={colors.Bg} p="lg" align="center">
+        <Skeleton radius="md" h={40} w="60%" />
+        <Skeleton radius="md" h={200} w="100%" />
+      </Stack>
+    )
+  }
+
+  const data = permohonanInformasiPublikState.statepermohonanInformasiPublik.findMany.data
 
   return (
-    <Box py={5}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Permohonan Informasi Publik</Title>
-          <Box>
-            <Table striped withRowBorders withColumnBorders withTableBorder>
-              <TableThead>
-                <TableTr>
-                  <TableTh>No</TableTh>
-                  <TableTh>Nama</TableTh>
-                  <TableTh>NIK</TableTh>
-                  <TableTh>Telepon</TableTh>
-                  <TableTh>Email</TableTh>
-                  <TableTh>Jenis Informasi</TableTh>
-                  <TableTh>Cara Memperoleh Informasi</TableTh>
-                  <TableTh>Cara Memperoleh Salinan Informasi</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {permohonanInformasiPublikState.statepermohonanInformasiPublik.findMany.data?.map((item, index) => (
-                  <TableTr key={item.id}>
-                    <TableTd>{index + 1}</TableTd>
-                    <TableTd>{item.name}</TableTd>
-                    <TableTd>{item.nik}</TableTd>
-                    <TableTd>{item.notelp}</TableTd>
-                    <TableTd>{item.email}</TableTd>
-                    <TableTd>{item.jenisInformasiDiminta?.name}</TableTd>
-                    <TableTd>{item.caraMemperolehInformasi?.name}</TableTd>
-                    <TableTd>{item.caraMemperolehSalinanInformasi?.name}</TableTd>
+    <Box py="md">
+      <Paper bg={colors['white-1']} p="lg" radius="xl" shadow="sm" withBorder>
+        <Stack gap="md">
+          <Group justify="space-between">
+            <Title order={2} c="dark">Daftar Permohonan Informasi Publik</Title>
+            <Tooltip label="Data permohonan informasi sesuai dengan pengajuan masyarakat" position="bottom">
+              <IconInfoCircle size={20} stroke={1.5} />
+            </Tooltip>
+          </Group>
+
+          {data.length === 0 ? (
+            <Stack align="center" py="xl">
+              <IconInfoCircle size={40} stroke={1.5} color={colors['blue-button']} />
+              <Text fw={500} c="dimmed">Belum ada permohonan informasi yang tercatat</Text>
+            </Stack>
+          ) : (
+            <Box style={{ overflowX: 'auto' }}>
+              <Table
+                highlightOnHover
+                withRowBorders
+                withColumnBorders
+                withTableBorder
+                striped
+                stickyHeader
+              >
+                <TableThead>
+                  <TableTr>
+                    <TableTh>No</TableTh>
+                    <TableTh><Group gap={5}><IconUser size={16} /> Nama</Group></TableTh>
+                    <TableTh><Group gap={5}><IconId size={16} /> NIK</Group></TableTh>
+                    <TableTh><Group gap={5}><IconPhone size={16} /> Telepon</Group></TableTh>
+                    <TableTh><Group gap={5}><IconMail size={16} /> Email</Group></TableTh>
+                    <TableTh>Jenis Informasi</TableTh>
+                    <TableTh>Cara Akses Informasi</TableTh>
+                    <TableTh>Salinan Informasi</TableTh>
                   </TableTr>
-                ))}
-              </TableTbody>
-            </Table> </Box>
+                </TableThead>
+                <TableTbody>
+                  {data.map((item, index) => (
+                    <TableTr key={item.id}>
+                      <TableTd>{index + 1}</TableTd>
+                      <TableTd>
+                        <Tooltip label={item.name}>
+                          <Text lineClamp={1} fw={500}>{item.name}</Text>
+                        </Tooltip>
+                      </TableTd>
+                      <TableTd>{item.nik}</TableTd>
+                      <TableTd>{item.notelp}</TableTd>
+                      <TableTd>{item.email}</TableTd>
+                      <TableTd>
+                        <Badge variant="light" radius="sm" color="blue">
+                          {item.jenisInformasiDiminta?.name || '-'}
+                        </Badge>
+                      </TableTd>
+                      <TableTd>
+                        <Tooltip label={item.caraMemperolehInformasi?.name}>
+                          <Text lineClamp={1} size="sm">{item.caraMemperolehInformasi?.name || '-'}</Text>
+                        </Tooltip>
+                      </TableTd>
+                      <TableTd>
+                        <Tooltip label={item.caraMemperolehSalinanInformasi?.name}>
+                          <Text lineClamp={1} size="sm">{item.caraMemperolehSalinanInformasi?.name || '-'}</Text>
+                        </Tooltip>
+                      </TableTd>
+                    </TableTr>
+                  ))}
+                </TableTbody>
+              </Table>
+            </Box>
+          )}
         </Stack>
       </Paper>
     </Box>
-  );
+  )
 }
 
-export default Page;
\ No newline at end of file
+export default Page
diff --git a/src/app/admin/(dashboard)/ppid/permohonan-keberatan-informasi-publik/page.tsx b/src/app/admin/(dashboard)/ppid/permohonan-keberatan-informasi-publik/page.tsx
index a53f6f4d..660cfb48 100644
--- a/src/app/admin/(dashboard)/ppid/permohonan-keberatan-informasi-publik/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/permohonan-keberatan-informasi-publik/page.tsx
@@ -1,9 +1,10 @@
 'use client'
-import colors from '@/con/colors';
-import { Box, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Title } from '@mantine/core';
-import { useShallowEffect } from '@mantine/hooks';
-import { useProxy } from 'valtio/utils';
-import statePermohonanKeberatan from '../../_state/ppid/permohonan_keberatan_informasi_publik/permohonanKeberatanInformasi';
+import colors from '@/con/colors'
+import { Box, Group, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core'
+import { useShallowEffect } from '@mantine/hooks'
+import { IconInfoCircle, IconMail, IconMessage, IconPhone, IconUser } from '@tabler/icons-react'
+import { useProxy } from 'valtio/utils'
+import statePermohonanKeberatan from '../../_state/ppid/permohonan_keberatan_informasi_publik/permohonanKeberatanInformasi'
 
 function Page() {
   const listState = useProxy(statePermohonanKeberatan)
@@ -11,38 +12,90 @@ function Page() {
     listState.findMany.load()
   }, [])
 
-  if (!listState.findMany.data)
-    return <Stack pos={"relative"} bg={colors.Bg}>
-      <Skeleton radius={5} h={200} />
-    </Stack>
+  if (!listState.findMany.data) {
+    return (
+      <Stack pos="relative" bg={colors.Bg} p="lg" align="center">
+        <Skeleton radius="md" h={40} w="60%" />
+        <Skeleton radius="md" h={200} w="100%" />
+      </Stack>
+    )
+  }
+
+  const data = listState.findMany.data
 
   return (
-    <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Permohonan Keberatan Informasi Publik</Title>
-          <Table striped withRowBorders withColumnBorders withTableBorder>
-            <TableThead>
-              <TableTr>
-                <TableTh>No</TableTh>
-                <TableTh>Nama</TableTh>
-                <TableTh>Email</TableTh>
-                <TableTh>Telepon</TableTh>
-                <TableTh>Alasan</TableTh>
-              </TableTr>
-            </TableThead>
-            <TableTbody>
-              {listState.findMany.data?.map((item, index) => (
-                <TableTr key={item.id}>
-                  <TableTd>{index + 1}</TableTd>
-                  <TableTd>{item.name}</TableTd>
-                  <TableTd>{item.email}</TableTd>
-                  <TableTd>{item.notelp}</TableTd>
-                  <TableTd dangerouslySetInnerHTML={{ __html: item.alasan }} />
-                </TableTr>
-              ))}
-            </TableTbody>
-          </Table>
+    <Box py="md">
+      <Paper bg={colors['white-1']} p="lg" radius="xl" shadow="sm" withBorder>
+        <Stack gap="md">
+          <Group justify="space-between">
+            <Title order={2} c="dark">Daftar Permohonan Keberatan Informasi Publik</Title>
+            <Tooltip label="Data permohonan keberatan atas informasi yang diajukan masyarakat" position="bottom">
+              <IconInfoCircle size={20} stroke={1.5} />
+            </Tooltip>
+          </Group>
+
+          {data.length === 0 ? (
+            <Stack align="center" py="xl">
+              <IconInfoCircle size={40} stroke={1.5} color={colors['blue-button']} />
+              <Text fw={500} c="dimmed">Belum ada permohonan keberatan yang tercatat</Text>
+            </Stack>
+          ) : (
+            <Box style={{ overflowX: 'auto' }}>
+              <Table
+                highlightOnHover
+                withRowBorders
+                withColumnBorders
+                withTableBorder
+                striped
+                stickyHeader
+              >
+                <TableThead>
+                  <TableTr>
+                    <TableTh>No</TableTh>
+                    <TableTh><Group gap={5}><IconUser size={16} /> Nama</Group></TableTh>
+                    <TableTh><Group gap={5}><IconMail size={16} /> Email</Group></TableTh>
+                    <TableTh><Group gap={5}><IconPhone size={16} /> Telepon</Group></TableTh>
+                    <TableTh><Group gap={5}><IconMessage size={16} /> Alasan Keberatan</Group></TableTh>
+                  </TableTr>
+                </TableThead>
+                <TableTbody>
+                  {data.map((item, index) => (
+                    <TableTr key={item.id}>
+                      <TableTd>{index + 1}</TableTd>
+                      <TableTd>
+                        <Tooltip label={item.name}>
+                          <Text lineClamp={1} fw={500}>{item.name}</Text>
+                        </Tooltip>
+                      </TableTd>
+                      <TableTd>
+                        <Text size="sm">{item.email || '-'}</Text>
+                      </TableTd>
+                      <TableTd>
+                        <Text>{item.notelp || '-'}</Text>
+                      </TableTd>
+                      <TableTd>
+                        <Tooltip label={item.alasan?.replace(/<[^>]*>?/gm, '')}>
+                          <div 
+                            style={{ 
+                              maxWidth: '300px',
+                              whiteSpace: 'nowrap',
+                              overflow: 'hidden',
+                              textOverflow: 'ellipsis' 
+                            }}
+                            dangerouslySetInnerHTML={{ 
+                              __html: item.alasan ? 
+                                item.alasan.replace(/<[^>]*>?/gm, '').substring(0, 50) + '...' : 
+                                '-' 
+                            }} 
+                          />
+                        </Tooltip>
+                      </TableTd>
+                    </TableTr>
+                  ))}
+                </TableTbody>
+              </Table>
+            </Box>
+          )}
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/ppid/profile-ppid/[id]/page.tsx b/src/app/admin/(dashboard)/ppid/profile-ppid/[id]/page.tsx
index b32c2162..3ff48c1a 100644
--- a/src/app/admin/(dashboard)/ppid/profile-ppid/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/profile-ppid/[id]/page.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import colors from '@/con/colors';
-import { Alert, Box, Button, Center, Group, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Alert, Box, Button, Center, Group, Image, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import stateProfilePPID from '../../../_state/ppid/profile_ppid/profile_PPID';
@@ -146,129 +146,139 @@ function EditProfilePPID() {
   }
 
   return (
-    <Box>
-      <Stack gap="xs">
-        <Box>
-          <Button variant="subtle" onClick={handleBack}>
-            <IconArrowBack color={colors['blue-button']} size={20} />
-          </Button>
-        </Box>
+    <Box p="md">
+      <Stack gap="md">
+        <Group mb="md">
+          <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+            <Button variant="subtle" onClick={handleBack} p="xs" radius="md">
+              <IconArrowBack color={colors['blue-button']} size={24} />
+            </Button>
+          </Tooltip>
+          <Title order={4} ml="sm" c="dark">
+            Edit Profil PPID
+          </Title>
+        </Group>
 
-        <Box>
-          <Paper w={{ base: "100%", md: "50%" }} bg={colors['white-1']} p="md" radius={10}>
-            <Stack gap="xs">
-              <Title order={3}>Edit Profile PPID</Title>
+        <Paper
+          w={{ base: "100%", md: "50%" }}
+          bg={colors['white-1']}
+          p="md"
+          radius="md"
+          shadow="sm"
+          style={{ border: '1px solid #e0e0e0' }}
+        >
+          <Stack gap="md">
+            <Title order={3} c={colors['blue-button']}>Edit Profile PPID</Title>
 
-              {/* Nama Field */}
-              <TextInput
-                label={<Text fw="bold">Nama Perbekel</Text>}
-                placeholder="Masukkan nama perbekel"
-                value={allState.editForm.form.name}
-                onChange={(e) => handleFieldChange('name', e.currentTarget.value)}
-                error={!allState.editForm.form.name && "Nama wajib diisi"}
-              />
+            {/* Nama Field */}
+            <TextInput
+              label={<Text fw="bold">Nama Perbekel</Text>}
+              placeholder="Masukkan nama perbekel"
+              value={allState.editForm.form.name}
+              onChange={(e) => handleFieldChange('name', e.currentTarget.value)}
+              error={!allState.editForm.form.name && "Nama wajib diisi"}
+            />
 
-              {/* File Upload */}
+            {/* File Upload */}
+            <Box>
+              <Text fz={"md"} fw={"bold"}>Gambar</Text>
               <Box>
-                <Text fz={"md"} fw={"bold"}>Gambar</Text>
-                <Box>
-                  <Dropzone
-                    onDrop={(files) => {
-                      const selectedFile = files[0]; // Ambil file pertama
-                      if (selectedFile) {
-                        setFile(selectedFile);
-                        setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                      }
-                    }}
-                    onReject={() => toast.error('File tidak valid.')}
-                    maxSize={5 * 1024 ** 2} // Maks 5MB
-                    accept={{ 'image/*': [] }}
-                  >
-                    <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                      <Dropzone.Accept>
-                        <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                      </Dropzone.Accept>
-                      <Dropzone.Reject>
-                        <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                      </Dropzone.Reject>
-                      <Dropzone.Idle>
-                        <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                      </Dropzone.Idle>
+                <Dropzone
+                  onDrop={(files) => {
+                    const selectedFile = files[0]; // Ambil file pertama
+                    if (selectedFile) {
+                      setFile(selectedFile);
+                      setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
+                    }
+                  }}
+                  onReject={() => toast.error('File tidak valid.')}
+                  maxSize={5 * 1024 ** 2} // Maks 5MB
+                  accept={{ 'image/*': [] }}
+                >
+                  <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
+                    <Dropzone.Accept>
+                      <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                    </Dropzone.Accept>
+                    <Dropzone.Reject>
+                      <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                    </Dropzone.Reject>
+                    <Dropzone.Idle>
+                      <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                    </Dropzone.Idle>
 
-                      <div>
-                        <Text size="xl" inline>
-                          Drag gambar ke sini atau klik untuk pilih file
-                        </Text>
-                        <Text size="sm" c="dimmed" inline mt={7}>
-                          Maksimal 5MB dan harus format gambar
-                        </Text>
-                      </div>
-                    </Group>
-                  </Dropzone>
+                    <div>
+                      <Text size="xl" inline>
+                        Tarik gambar ke sini atau klik untuk memilih file
+                      </Text>
+                      <Text size="sm" c="dimmed" inline mt={7}>
+                        Maksimal 5MB dan harus format gambar
+                      </Text>
+                    </div>
+                  </Group>
+                </Dropzone>
 
-                  {/* Tampilkan preview kalau ada */}
-                  {previewImage && (
-                    <Box mt="sm">
-                      <Image
-                        src={previewImage}
-                        alt="Preview"
-                        style={{
-                          maxWidth: '100%',
-                          maxHeight: '200px',
-                          objectFit: 'contain',
-                          borderRadius: '8px',
-                          border: '1px solid #ddd',
-                        }}
-                      />
-                    </Box>
-                  )}
+                {/* Tampilkan preview kalau ada */}
+                {previewImage && (
+                  <Box mt="sm">
+                    <Image
+                      src={previewImage}
+                      alt="Preview"
+                      style={{
+                        maxWidth: '100%',
+                        maxHeight: '200px',
+                        objectFit: 'contain',
+                        borderRadius: '8px',
+                        border: '1px solid #ddd',
+                      }}
+                    />
+                  </Box>
+                )}
 
-                </Box>
               </Box>
+            </Box>
 
-              {/* Rich Components */}
-              <Biodata
-                value={allState.editForm.form.biodata}
-                onChange={(val) => handleFieldChange('biodata', val)}
-              />
+            {/* Rich Components */}
+            <Biodata
+              value={allState.editForm.form.biodata}
+              onChange={(val) => handleFieldChange('biodata', val)}
+            />
 
-              <RiwayatKarir
-                value={allState.editForm.form.riwayat}
-                onChange={(val) => handleFieldChange('riwayat', val)}
-              />
+            <RiwayatKarir
+              value={allState.editForm.form.riwayat}
+              onChange={(val) => handleFieldChange('riwayat', val)}
+            />
 
-              <PengalamanOrganisasi
-                value={allState.editForm.form.pengalaman}
-                onChange={(val) => handleFieldChange('pengalaman', val)}
-              />
+            <PengalamanOrganisasi
+              value={allState.editForm.form.pengalaman}
+              onChange={(val) => handleFieldChange('pengalaman', val)}
+            />
 
-              <ProgramKerjaUnggulan
-                value={allState.editForm.form.unggulan}
-                onChange={(val) => handleFieldChange('unggulan', val)}
-              />
+            <ProgramKerjaUnggulan
+              value={allState.editForm.form.unggulan}
+              onChange={(val) => handleFieldChange('unggulan', val)}
+            />
 
-              {/* Submit Button */}
-              <Group>
-                <Button
-                  bg={colors['blue-button']}
-                  onClick={handleSubmit}
-                  loading={isSubmitting || allState.editForm.loading}
-                  disabled={!allState.editForm.form.name}
-                >
-                  {isSubmitting ? 'Menyimpan...' : 'Simpan Perubahan'}
-                </Button>
+            {/* Submit Button */}
+            <Group>
+              <Button
+                bg={colors['blue-button']}
+                onClick={handleSubmit}
+                loading={isSubmitting || allState.editForm.loading}
+                disabled={!allState.editForm.form.name}
+              >
+                {isSubmitting ? 'Menyimpan...' : 'Simpan Perubahan'}
+              </Button>
 
-                <Button
-                  variant="outline"
-                  onClick={handleBack}
-                  disabled={isSubmitting || allState.editForm.loading}
-                >
-                  Batal
-                </Button>
-              </Group>
-            </Stack>
-          </Paper>
-        </Box>
+              <Button
+                variant="outline"
+                onClick={handleBack}
+                disabled={isSubmitting || allState.editForm.loading}
+              >
+                Batal
+              </Button>
+            </Group>
+          </Stack>
+        </Paper>
       </Stack>
     </Box>
   );
diff --git a/src/app/admin/(dashboard)/ppid/profile-ppid/page.tsx b/src/app/admin/(dashboard)/ppid/profile-ppid/page.tsx
index 17cfc301..9d294848 100644
--- a/src/app/admin/(dashboard)/ppid/profile-ppid/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/profile-ppid/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Divider, Grid, GridCol, Image, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
+import { Box, Button, Center, Divider, Grid, GridCol, Image, Paper, Skeleton, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconEdit } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -16,9 +16,11 @@ function Page() {
   }, [])
 
   if (!allList.profile.data) {
-    return <Stack>
-      <Skeleton radius={10} h={800} />
-    </Stack>
+    return (
+      <Stack align="center" justify="center" py="xl">
+        <Skeleton radius="md" height={800} />
+      </Stack>
+    );
   }
 
   const dataArray = Array.isArray(allList.profile.data)
@@ -26,89 +28,96 @@ function Page() {
     : [allList.profile.data];
 
   return (
-    <Paper bg={colors['white-1']} p={'md'}>
-      <Stack gap={"xs"}>
-        <Grid>
+    <Paper bg={colors['white-1']} p="lg" radius="md" shadow="sm">
+      <Stack gap="md">
+        <Grid align="center">
           <GridCol span={{ base: 12, md: 11 }}>
-            <Title order={3}>Preview Profile PPID</Title>
+            <Title order={3} c={colors['blue-button']}>Preview Profil PPID</Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 1 }}>
-            <Button bg={colors['blue-button']} onClick={() => router.push(`/admin/ppid/profile-ppid/${allList.profile.data?.id}`)}>
-              <IconEdit size={16} />
-            </Button>
+            <Tooltip label="Edit Profil PPID" withArrow>
+              <Button
+                c="green"
+                variant="light"
+                leftSection={<IconEdit size={18} stroke={2} />}
+                radius="md"
+                onClick={() => router.push(`/admin/ppid/profile-ppid/${allList.profile.data?.id}`)}
+              >
+                Edit
+              </Button>
+            </Tooltip>
           </GridCol>
         </Grid>
         {dataArray.map((item) => (
-          <Box key={item.id} >
-            <Paper p={"xl"} bg={colors['BG-trans']}>
-              <Box px={{ base: "md", md: 100 }}>
-                <Grid>
-                  <GridCol span={{ base: 12, md: 12 }}>
-                    <Center>
-                      <Image src={"/darmasaba-icon.png"} w={{ base: 100, md: 150 }} alt='' />
-                    </Center>
-                  </GridCol>
-                  <GridCol span={{ base: 12, md: 12 }}>
-                    <Text ta={"center"} fz={{ base: "1.2rem", md: "1.8rem" }} fw={'bold'}>PROFIL PIMPINAN BADAN PUBLIK DESA DARMASABA </Text>
-                  </GridCol>
-                </Grid>
-              </Box>
-              <Divider my={"md"} color={colors['blue-button']} />
-              {/* biodata perbekel */}
-              <Box px={{ base: 0, md: 50 }} pb={30}>
-                <Box pb={20} px={{ base: 0, md: 50 }}>
-                  <Paper bg={colors['BG-trans']} w={{ base: "100%", md: "100%" }}>
-                    <Stack gap={0}>
-                      <Center>
-                        <Image
-                          pt={{ base: 0, md: 90 }}
-                          src={item.image?.link || "/perbekel.png"}
-                          w={{ base: 250, md: 350 }}
-                          alt='Foto Profil PPID'
-                          onError={(e) => {
-                            e.currentTarget.src = "/perbekel.png";
-                          }}
-                        />
-                      </Center>
-                      <Paper
-                        bg={colors['blue-button']}
-                        py={20}
-                        className="glass3"
-                        px={{ base: 10, md: 10 }}
-
-                      >
-                        <Text ta={"center"} c={colors['white-1']} fw={"bolder"} fz={{ base: "1.2rem", md: "1.6rem" }}>
-                          {item.name}
-                        </Text>
-                      </Paper>
-                    </Stack>
+          <Paper key={item.id} p="xl" bg={'white'} withBorder radius="md" shadow="xs">
+            <Box px={{ base: "sm", md: 100 }}>
+              <Grid>
+                <GridCol span={12}>
+                  <Center>
+                    <Image src="/darmasaba-icon.png" w={{ base: 100, md: 150 }} alt="Logo Desa" />
+                  </Center>
+                </GridCol>
+                <GridCol span={12}>
+                  <Text ta="center" fz={{ base: "1.2rem", md: "1.8rem" }} fw="bold" c={colors['blue-button']}>
+                    PROFIL PIMPINAN BADAN PUBLIK DESA DARMASABA
+                  </Text>
+                </GridCol>
+              </Grid>
+            </Box>
+            <Divider my="md" color={colors['blue-button']} />
+            <Box px={{ base: 0, md: 50 }} pb="xl">
+              <Paper bg={colors['BG-trans']} radius="md" shadow="xs" p="lg">
+                <Stack gap={0}>
+                  <Center>
+                    <Image
+                      pt={{ base: 0, md: 60 }}
+                      src={item.image?.link || "/perbekel.png"}
+                      w={{ base: 250, md: 350 }}
+                      alt="Foto Profil PPID"
+                      radius="md"
+                      onError={(e) => { e.currentTarget.src = "/perbekel.png"; }}
+                    />
+                  </Center>
+                  <Paper
+                    bg={colors['blue-button']}
+                    py="md"
+                    px="sm"
+                    radius="md"
+                    className="glass3"
+                    style={{ mt: -30, boxShadow: '0 4px 20px rgba(0,0,0,0.15)' }}
+                  >
+                    <Text ta="center" c={colors['white-1']} fw="bolder" fz={{ base: "1.2rem", md: "1.6rem" }}>
+                      {item.name}
+                    </Text>
                   </Paper>
-                </Box>
-                <Box pt={10}>
-                  <Box>
-                    <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Biodata</Text>
-                    <Text fz={{ base: "1rem", md: "1.5rem" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: item.biodata }} />
-                  </Box>
-                  <Box>
-                    <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Riwayat Karir</Text>
-                    <Text fz={{ base: "1rem", md: "1.5rem" }} dangerouslySetInnerHTML={{ __html: item.riwayat }} />
-                  </Box>
-                </Box>
-                <Box pb={30}>
-                  <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Pengalaman Organisasi</Text>
-                  <Box px={20}>
-                    <Text fz={{ base: "1rem", md: "1.5rem" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: item.pengalaman }} />
-                  </Box>
-                </Box>
-                <Box pb={20}>
-                  <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Program Kerja Unggulan</Text>
-                  <Box px={20}>
-                    <Text fz={{ base: "1rem", md: "1.5rem" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: item.unggulan }} />
-                  </Box>
+                </Stack>
+              </Paper>
+              
+              <Box mt="lg">
+                <Text fz={{ base: "1.125rem", md: "1.5rem" }} fw="bold" mb={4}>Biodata</Text>
+                <Text fz={{ base: "1rem", md: "1.4rem" }} ta="justify" c={colors['blue-button']} dangerouslySetInnerHTML={{ __html: item.biodata }} />
+              </Box>
+              
+              <Box mt="xl">
+                <Text fz={{ base: "1.125rem", md: "1.5rem" }} fw="bold" mb={4}>Riwayat Karir</Text>
+                <Text fz={{ base: "1rem", md: "1.4rem" }} ta="justify" c={colors['blue-button']} dangerouslySetInnerHTML={{ __html: item.riwayat }} />
+              </Box>
+              
+              <Box mt="xl">
+                <Text fz={{ base: "1.125rem", md: "1.5rem" }} fw="bold" mb={4}>Pengalaman Organisasi</Text>
+                <Box px={20}>
+                  <Text fz={{ base: "1rem", md: "1.4rem" }} ta="justify" c={colors['blue-button']} dangerouslySetInnerHTML={{ __html: item.pengalaman }} />
                 </Box>
               </Box>
-            </Paper>
-          </Box>
+              
+              <Box mt="xl" mb="lg">
+                <Text fz={{ base: "1.125rem", md: "1.5rem" }} fw="bold" mb={4}>Program Kerja Unggulan</Text>
+                <Box px={20}>
+                  <Text fz={{ base: "1rem", md: "1.4rem" }} ta="justify" c={colors['blue-button']} dangerouslySetInnerHTML={{ __html: item.unggulan }} />
+                </Box>
+              </Box>
+            </Box>
+          </Paper>
         ))}
       </Stack>
     </Paper>
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/_lib/layoutTabs.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/_lib/layoutTabs.tsx
index c5eb0e8d..5cf558b3 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/_lib/layoutTabs.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/_lib/layoutTabs.tsx
@@ -1,65 +1,108 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
+import { IconBuildingCommunity, IconHierarchy2, IconUsers } from '@tabler/icons-react';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
-  const router = useRouter()
-  const pathname = usePathname()
+  const router = useRouter();
+  const pathname = usePathname();
+  
   const tabs = [
     {
       label: "Pegawai",
       value: "pegawai",
-      href: "/admin/ppid/struktur-ppid/pegawai"
+      href: "/admin/ppid/struktur-ppid/pegawai",
+      icon: <IconUsers size={18} stroke={1.8} />,
+      tooltip: "Kelola daftar pegawai PPID"
     },
     {
       label: "Posisi Organisasi",
       value: "posisiorganisasi",
-      href: "/admin/ppid/struktur-ppid/posisi-organisasi"
+      href: "/admin/ppid/struktur-ppid/posisi-organisasi",
+      icon: <IconHierarchy2 size={18} stroke={1.8} />,
+      tooltip: "Kelola posisi dalam struktur organisasi"
     },
     {
       label: "Struktur Organisasi",
       value: "strukturorganisasi",
-      href: "/admin/ppid/struktur-ppid/struktur-organisasi"
+      href: "/admin/ppid/struktur-ppid/struktur-organisasi",
+      icon: <IconBuildingCommunity size={18} stroke={1.8} />,
+      tooltip: "Kelola struktur organisasi PPID"
     }
   ];
-  const curentTab = tabs.find(tab => tab.href === pathname)
-  const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+  const currentTab = tabs.find(tab => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(currentTab?.value || tabs[0].value);
 
   const handleTabChange = (value: string | null) => {
-    const tab = tabs.find(t => t.value === value)
+    const tab = tabs.find(t => t.value === value);
     if (tab) {
-      router.push(tab.href)
+      router.push(tab.href);
     }
-    setActiveTab(value)
-  }
+    setActiveTab(value);
+  };
 
   useEffect(() => {
-    const match = tabs.find(tab => tab.href === pathname)
+    const match = tabs.find(tab => tab.href === pathname);
     if (match) {
-      setActiveTab(match.value)
+      setActiveTab(match.value);
     }
-  }, [pathname])
+  }, [pathname]);
 
   return (
-    <Stack>
-      <Title order={3}>Struktur PPID Desa Darmasaba</Title>
-      <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-        <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-          {tabs.map((e, i) => (
-            <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
+    <Stack gap="lg">
+      <Title order={2} fw={700} style={{ color: "#1A1B1E" }}>
+        Struktur PPID
+      </Title>
+      <Tabs
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+        radius="lg"
+        keepMounted={false}
+      >
+        <TabsList
+          p="sm"
+          style={{
+            background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+            borderRadius: "1rem",
+            boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+          }}
+        >
+          {tabs.map((tab, i) => (
+            <Tooltip key={i} label={tab.tooltip} position="bottom" withArrow transitionProps={{ transition: 'pop', duration: 200 }}>
+              <TabsTab
+                value={tab.value}
+                leftSection={tab.icon}
+                style={{
+                  fontWeight: 600,
+                  fontSize: "0.9rem",
+                  transition: "all 0.2s ease",
+                }}
+              >
+                {tab.label}
+              </TabsTab>
+            </Tooltip>
           ))}
         </TabsList>
-        {tabs.map((e, i) => (
-          <TabsPanel key={i} value={e.value}>
-            {/* Konten dummy, bisa diganti tergantung routing */}
-            <></>
+
+        {tabs.map((tab, i) => (
+          <TabsPanel
+            key={i}
+            value={tab.value}
+            style={{
+              padding: "1.5rem",
+              background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+              borderRadius: "1rem",
+              boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+            }}
+          >
+            {children}
           </TabsPanel>
         ))}
       </Tabs>
-      {children}
     </Stack>
   );
 }
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/edit/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/edit/page.tsx
index 42e78a92..bc2055f8 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/edit/page.tsx
@@ -13,7 +13,8 @@ import {
   Stack,
   Text,
   TextInput,
-  Title
+  Title,
+  Tooltip
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
@@ -134,142 +135,190 @@ export default function EditPegawaiPPID() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Data Pegawai PPID
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Data Pegawai PPID</Title>
-          <TextInput
-            label="Nama Lengkap"
-            placeholder="Masukkan nama lengkap"
-            value={formData.namaLengkap}
-            onChange={(e) => setFormData({ ...formData, namaLengkap: e.target.value })}
-          />
-          <TextInput
-            label="Gelar Akademik"
-            placeholder="Contoh: S.Kom"
-            value={formData.gelarAkademik}
-            onChange={(e) => setFormData({ ...formData, gelarAkademik: e.target.value })}
-          />
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box >
-              <Dropzone
-                onDrop={(files) => {
-                  const file = files[0]; // Hanya ambil file pertama
-                  if (file) {
-                    setFile(file);
-                    setPreviewImage(URL.createObjectURL(file)); // Buat preview
-                  }
-                }}
-                maxSize={5 * 1024 ** 2} // 5MB
-                accept={{
-                  'image/*': ['.jpeg', '.jpg', '.png', '.webp']
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Nama Lengkap
+            </Text>
+            <TextInput
+              placeholder="Masukkan nama lengkap"
+              value={formData.namaLengkap}
+              onChange={(e) => setFormData({ ...formData, namaLengkap: e.target.value })}
+              required
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gelar Akademik
+            </Text>
+            <TextInput
+              placeholder="Contoh: S.Kom"
+              value={formData.gelarAkademik}
+              onChange={(e) => setFormData({ ...formData, gelarAkademik: e.target.value })}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Foto Profil
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar wajib
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag images here or click to select files
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Attach as many files as you like, each file should not exceed 5mb
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              {previewImage && (
+            {previewImage && (
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
                 <Image
                   src={previewImage}
-                  alt="Preview"
-                  width={280}
-                  height={180}
-                  fit="cover"
-                  radius="sm"
-                  mt="md"
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{ maxHeight: 220, objectFit: 'contain', border: `1px solid ${colors['blue-button']}` }}
                 />
-              )}
-            </Box>
+              </Box>
+            )}
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Tanggal Masuk
+            </Text>
+            <TextInput
+              type="date"
+              placeholder="Contoh: 2022-01-01"
+              value={formatDateForInput(formData.tanggalMasuk)}
+              onChange={(e) => setFormData({ ...formData, tanggalMasuk: e.target.value })}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Email
+            </Text>
+            <TextInput
+              type="email"
+              placeholder="contoh@email.com"
+              value={formData.email}
+              onChange={(e) => setFormData({ ...formData, email: e.target.value })}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Telepon
+            </Text>
+            <TextInput
+              placeholder="08123456789"
+              value={formData.telepon}
+              onChange={(e) => setFormData({ ...formData, telepon: e.target.value })}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Alamat
+            </Text>
+            <TextInput
+              placeholder="Jl. Contoh No. 123"
+              value={formData.alamat}
+              onChange={(e) => setFormData({ ...formData, alamat: e.target.value })}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Posisi
+            </Text>
+            <Select
+              placeholder="Pilih posisi"
+              data={stateStrukturPPID.posisiOrganisasi.findMany.data?.map(p => ({
+                value: p.id,
+                label: p.nama
+              })) || []}
+              value={formData.posisiId}
+              onChange={(value) => value && setFormData({ ...formData, posisiId: value })}
+              searchable
+              clearable
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Status Pegawai
+            </Text>
+            <Select
+              data={[
+                { value: 'true', label: 'Aktif' },
+                { value: 'false', label: 'Tidak Aktif' },
+              ]}
+              value={String(formData.isActive)}
+              onChange={(val) => {
+                setFormData({ ...formData, isActive: val === 'true' });
+              }}
+              clearable
+            />
           </Box>
-          <TextInput
-            label="Tanggal Masuk"
-            type="date"
-            placeholder="Contoh: 2022-01-01"
-            value={formatDateForInput(formData.tanggalMasuk)}
-            onChange={(e) => setFormData({ ...formData, tanggalMasuk: e.target.value })}
-          />
-          <TextInput
-            label="Email"
-            placeholder="Contoh: email@example.com"
-            value={formData.email}
-            onChange={(e) => (formData.email = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Telepon"
-            placeholder="Contoh: 08123456789"
-            value={formData.telepon}
-            onChange={(e) => (formData.telepon = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Alamat"
-            placeholder="Contoh: Jl. Contoh No. 1"
-            value={formData.alamat}
-            onChange={(e) => (formData.alamat = e.currentTarget.value)}
-          />
-          <Select
-            label="Posisi"
-            placeholder="Pilih posisi"
-            data={
-              stateStrukturPPID.posisiOrganisasi.findMany.data?.map((p) => ({
-                value: p.id, // harus string
-                label: p.nama,
-              })) || []
-            }
-            value={formData.posisiId}
-            onChange={(value) => {
-              if (value !== null) {
-                setFormData({ ...formData, posisiId: value }); // value harus string
-              }
-            }}
-          />
-          <Select
-            label="Status Pegawai"
-            data={[
-              { value: 'true', label: 'Aktif' },
-              { value: 'false', label: 'Tidak Aktif' },
-            ]}
-            value={String(formData.isActive)} // 'true' atau 'false'
-            onChange={(val) => {
-              setFormData({ ...formData, isActive: val === 'true' });
-            }}
-          />
 
-
-          <Group>
+          <Group justify="flex-end" mt="md">
             <Button
               onClick={handleSubmit}
-              color="blue"
+              loading={stateOrganisasi.edit.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
             >
-              Simpan
+              Simpan Perubahan
             </Button>
           </Group>
         </Stack>
       </Paper>
-    </Box >
+    </Box>
   );
 }
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/page.tsx
index a0b1e25e..da7c1aa4 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/[id]/page.tsx
@@ -2,41 +2,43 @@
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import stateStrukturPPID from '@/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID';
 import colors from '@/con/colors';
-import { Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
 function DetailPegawai() {
-  const statePegawai = useProxy(stateStrukturPPID.pegawai)
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
+  const statePegawai = useProxy(stateStrukturPPID.pegawai);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
   const router = useRouter();
 
   useShallowEffect(() => {
-    statePegawai.findUnique.load(params?.id as string)
-  }, [])
+    statePegawai.findUnique.load(params?.id as string);
+  }, []);
 
   const handleHapus = () => {
     if (selectedId) {
-      statePegawai.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/ppid/struktur-ppid/pegawai")
+      statePegawai.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push("/admin/ppid/struktur-ppid/pegawai");
     }
-  }
+  };
 
   if (!statePegawai.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = statePegawai.findUnique.data;
+
   return (
     <Box>
       <Box mb={10}>
@@ -44,91 +46,111 @@ function DetailPegawai() {
           <IconArrowBack color={colors['blue-button']} size={25} />
         </Button>
       </Box>
-      <Paper w={{ base: "100%", md: "50%" }} bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Pegawai PPID</Text>
-          <Paper bg={colors['BG-trans']} p={'md'}>
-            <Stack gap={"xs"}>
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "60%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Pegawai PPID
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="md">
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Nama Lengkap</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.namaLengkap}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Gelar Akademik</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.gelarAkademik}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Image</Text>
-                {statePegawai.findUnique.data?.image?.link ? (
-                  <Image src={statePegawai.findUnique.data?.image?.link} alt='' />
-                ) : (
-                  <Text fz={"md"} c="dimmed">Tidak ada gambar</Text>
-                )}
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Tanggal Masuk</Text>
-                <Text fz={"lg"}>
-                  {statePegawai.findUnique.data?.tanggalMasuk
-                    ? new Date(statePegawai.findUnique.data.tanggalMasuk).toLocaleDateString()
-                    : "-"}
+                <Text fz="lg" fw="bold">Nama Lengkap</Text>
+                <Text fz="md" c="dimmed">
+                  {data.namaLengkap || '-'} {data.gelarAkademik || ''}
                 </Text>
               </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Email</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.email}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Telepon</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.telepon}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Alamat</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.alamat}</Text>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Posisi</Text>
-                <Stack gap={4}>
-                  {statePegawai.findUnique.data?.posisi ? (
-                    <Text fz={"lg"}>
-                     {statePegawai.findUnique.data.posisi.nama}
-                    </Text>
-                  ) : (
-                    <Text fz={"lg"} c="dimmed">
-                      Tidak ada posisi
-                    </Text>
-                  )}
-                </Stack>
-              </Box>
-              <Box>
-                <Text fz={"lg"} fw={"bold"}>Aktif</Text>
-                <Text fz={"lg"}>{statePegawai.findUnique.data?.isActive ? "Ya" : "Tidak"}</Text>
-              </Box>
 
               <Box>
-                <Flex gap={"xs"}>
-                  <Button
-                    onClick={() => {
-                      if (statePegawai.findUnique.data) {
-                        setSelectedId(statePegawai.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                <Text fz="lg" fw="bold">Posisi</Text>
+                <Text fz="md" c="dimmed">{data.posisi?.nama || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Email</Text>
+                <Text fz="md" c="dimmed">{data.email || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Telepon</Text>
+                <Text fz="md" c="dimmed">{data.telepon || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Alamat</Text>
+                <Text fz="md" c="dimmed">{data.alamat || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Tanggal Masuk</Text>
+                <Text fz="md" c="dimmed">
+                  {data.tanggalMasuk ? new Date(data.tanggalMasuk).toLocaleDateString() : '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Status</Text>
+                <Text fz="md" c={data.isActive ? 'green' : 'red'}>
+                  {data.isActive ? 'Aktif' : 'Tidak Aktif'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Foto Profil</Text>
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.namaLengkap || 'Foto Profil'}
+                    w={200}
+                    h={200}
+                    radius="md"
+                    fit="cover"
+                    mt="sm"
+                    style={{
+                      border: '1px solid #e0e0e0',
+                      borderRadius: '8px',
                     }}
-                    disabled={!statePegawai.findUnique.data}
-                    color="red">
-                    <IconX size={20} />
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed" mt="sm">Tidak ada foto profil</Text>
+                )}
+              </Box>
+
+              <Group gap="sm" mt="md">
+                <Tooltip label="Hapus Pegawai" withArrow position="top">
+                  <Button
+                    color="red"
+                    onClick={() => {
+                      setSelectedId(data.id || null);
+                      setModalHapus(true);
+                    }}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconTrash size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Pegawai" withArrow position="top">
                   <Button
-                    onClick={() => {
-                      if (statePegawai.findUnique.data) {
-                        router.push(`/admin/ppid/struktur-ppid/pegawai/${statePegawai.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!statePegawai.findUnique.data}
-                    color="green">
+                    color="green"
+                    onClick={() => router.push(`/admin/ppid/struktur-ppid/pegawai/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Box>
+                </Tooltip>
+              </Group>
             </Stack>
           </Paper>
         </Stack>
@@ -139,7 +161,7 @@ function DetailPegawai() {
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text="Apakah anda yakin ingin menghapus pegawai ini?"
+        text="Apakah Anda yakin ingin menghapus data pegawai ini?"
       />
     </Box>
   );
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/create/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/create/page.tsx
index f2cc3a20..42e80f57 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/create/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/create/page.tsx
@@ -3,7 +3,7 @@
 import stateStrukturPPID from '@/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -30,7 +30,7 @@ function CreatePegawaiPPID() {
       telepon: "",
       alamat: "",
       posisiId: "",
-      isActive: true,  
+      isActive: true,
     };
   };
 
@@ -53,14 +53,14 @@ function CreatePegawaiPPID() {
 
       // Set status aktif secara otomatis
       stateOrganisasi.create.form.isActive = true;
-      
+
       // Simpan ID gambar ke form
       stateOrganisasi.create.form.imageId = uploaded.id;
-      
+
       // Submit form
       await stateOrganisasi.create.submit();
-      
-      
+
+
       // Reset form dan redirect
       resetForm();
       toast.success("Data pegawai berhasil ditambahkan");
@@ -72,125 +72,201 @@ function CreatePegawaiPPID() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Create Pegawai</Title>
-          <TextInput
-            label="Nama Lengkap"
-            placeholder="Masukkan nama lengkap"
-            value={stateOrganisasi.create.form.namaLengkap}
-            onChange={(e) => (stateOrganisasi.create.form.namaLengkap = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Gelar Akademik"
-            placeholder="Contoh: S.Kom"
-            value={stateOrganisasi.create.form.gelarAkademik}
-            onChange={(e) => (stateOrganisasi.create.form.gelarAkademik = e.currentTarget.value)}
-          />
-          <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box >
-              <Dropzone
-                onDrop={(files) => {
-                  const file = files[0]; // Hanya ambil file pertama
-                  if (file) {
-                    setPreviewImage({
-                      file,
-                      preview: URL.createObjectURL(file)
-                    });
-                  }
-                }}
-                maxSize={5 * 1024 ** 2} // 5MB
-                accept={{
-                  'image/*': ['.jpeg', '.jpg', '.png', '.webp']
-                }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Pegawai PPID
+        </Title>
+      </Group>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag images here or click to select files
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Attach as many files as you like, each file should not exceed 5mb
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-              {previewImage && (
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Nama Lengkap
+            </Text>
+            <TextInput
+              placeholder="Masukkan nama lengkap"
+              value={stateOrganisasi.create.form.namaLengkap}
+              onChange={(e) => (stateOrganisasi.create.form.namaLengkap = e.currentTarget.value)}
+              required
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gelar Akademik
+            </Text>
+            <TextInput
+              placeholder="Contoh: S.Kom"
+              value={stateOrganisasi.create.form.gelarAkademik}
+              onChange={(e) => (stateOrganisasi.create.form.gelarAkademik = e.currentTarget.value)}
+            />
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Foto Profil
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const file = files[0];
+                if (file) {
+                  setPreviewImage({
+                    file,
+                    preview: URL.createObjectURL(file)
+                  });
+                }
+              }}
+              maxSize={5 * 1024 ** 2} // 5MB
+              accept={{
+                'image/*': ['.jpeg', '.jpg', '.png', '.webp']
+              }}
+              styles={{
+                root: {
+                  border: '2px dashed #ced4da',
+                  borderRadius: '8px',
+                  padding: '20px',
+                  textAlign: 'center',
+                  cursor: 'pointer',
+                  '&:hover': {
+                    borderColor: '#228be6',
+                  },
+                },
+              }}
+            >
+              <Group justify="center" gap="xl" mih={160} style={{ pointerEvents: 'none' }}>
+                <Dropzone.Accept>
+                  <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+
+                <div>
+                  <Text size="md" inline>
+                    Seret gambar ke sini atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed" inline mt={7}>
+                    Format yang didukung: JPG, PNG, WebP. Maksimal 5MB
+                  </Text>
+                </div>
+              </Group>
+            </Dropzone>
+
+            {previewImage && (
+              <Box mt="md">
+                <Text fw="bold" fz="sm" mb={6}>
+                  Preview Gambar
+                </Text>
                 <Image
                   src={previewImage.preview}
                   alt="Preview"
-                  width={280}
-                  height={180}
+                  width={200}
+                  height={200}
                   fit="cover"
-                  radius="sm"
-                  mt="md"
+                  radius="md"
+                  style={{
+                    border: '1px solid #e0e0e0',
+                    borderRadius: '8px',
+                  }}
                 />
-              )}
-            </Box>
+              </Box>
+            )}
+          </Box>
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Tanggal Masuk
+            </Text>
+            <TextInput
+              type="date"
+              placeholder="Contoh: 2022-01-01"
+              value={stateOrganisasi.create.form.tanggalMasuk}
+              onChange={(e) => (stateOrganisasi.create.form.tanggalMasuk = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Email
+            </Text>
+            <TextInput
+              type="email"
+              placeholder="Contoh: email@example.com"
+              value={stateOrganisasi.create.form.email}
+              onChange={(e) => (stateOrganisasi.create.form.email = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Nomor Telepon
+            </Text>
+            <TextInput
+              placeholder="Contoh: 08123456789"
+              value={stateOrganisasi.create.form.telepon}
+              onChange={(e) => (stateOrganisasi.create.form.telepon = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Alamat
+            </Text>
+            <TextInput
+              placeholder="Contoh: Jl. Contoh No. 1"
+              value={stateOrganisasi.create.form.alamat}
+              onChange={(e) => (stateOrganisasi.create.form.alamat = e.currentTarget.value)}
+            />
+          </Box>
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Posisi
+            </Text>
+            <Select
+              placeholder="Pilih posisi"
+              data={stateStrukturPPID.posisiOrganisasi.findMany.data?.map(p => ({
+                value: p.id,
+                label: p.nama
+              })) || []}
+              value={stateOrganisasi.create.form.posisiId}
+              onChange={(value) => {
+                if (value) stateOrganisasi.create.form.posisiId = value;
+              }}
+              searchable
+              clearable
+            />
           </Box>
-          <TextInput
-            label="Tanggal Masuk"
-            type="date"
-            placeholder="Contoh: 2022-01-01"
-            value={stateOrganisasi.create.form.tanggalMasuk}
-            onChange={(e) => (stateOrganisasi.create.form.tanggalMasuk = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Email"
-            placeholder="Contoh: email@example.com"
-            value={stateOrganisasi.create.form.email}
-            onChange={(e) => (stateOrganisasi.create.form.email = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Telepon"
-            placeholder="Contoh: 08123456789"
-            value={stateOrganisasi.create.form.telepon}
-            onChange={(e) => (stateOrganisasi.create.form.telepon = e.currentTarget.value)}
-          />
-          <TextInput
-            label="Alamat"
-            placeholder="Contoh: Jl. Contoh No. 1"
-            value={stateOrganisasi.create.form.alamat}
-            onChange={(e) => (stateOrganisasi.create.form.alamat = e.currentTarget.value)}
-          />
-          <Select
-            label="Posisi"
-            placeholder="Pilih posisi"
-            data={stateStrukturPPID.posisiOrganisasi.findMany.data?.map(p => ({
-              value: p.id,
-              label: p.nama
-            })) || []}
-            value={stateOrganisasi.create.form.posisiId}
-            onChange={(value) => {
-              if (value) stateOrganisasi.create.form.posisiId = value;
-            }}
-            searchable
-          />
 
 
-          <Button
-            onClick={handleSubmit}
-            color="blue"
-          >
-            Simpan
-          </Button>
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/page.tsx
index 456229ac..dc6cee57 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/pegawai/page.tsx
@@ -1,13 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Badge, Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, ThemeIcon } from '@mantine/core';
-import { IconCheck, IconDeviceImacCog, IconSearch, IconX } from '@tabler/icons-react';
+import { Badge, Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, ThemeIcon, Title, Tooltip } from '@mantine/core';
+import { IconCheck, IconDeviceImacCog, IconPlus, IconSearch, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import stateStrukturPPID from '../../../_state/ppid/struktur_ppid/struktur_PPID';
 
 function PegawaiPPID() {
@@ -16,7 +15,7 @@ function PegawaiPPID() {
     <Box>
       <HeaderSearch
         title='Pegawai PPID'
-        placeholder='pencarian'
+        placeholder='Cari nama pegawai atau posisi...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -56,46 +55,51 @@ function ListPegawaiPPID({ search }: { search: string }) {
   if (data.length === 0) {
     return (
       <Box py={10}>
-         <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Pegawai'
-          href='/admin/ppid/struktur-ppid/pegawai/create'
-        />
-        <Box style={{ overflowX: "auto" }}>
-          <Table striped withTableBorder withRowBorders>
-            <TableThead>
-              <TableTr>
-                <TableTh>Nama</TableTh>
-                <TableTh>Gelar Akademik</TableTh>
-                <TableTh>Telepon</TableTh>
-                <TableTh>Posisi</TableTh>
-                <TableTh>Aktif</TableTh>
-                <TableTh>Detail</TableTh>
-              </TableTr>
-            </TableThead>
-          </Table>
-        </Box>
-      </Paper>
+        <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+          <Group justify="space-between" mb="md">
+            <Title order={4}>Daftar Pegawai PPID</Title>
+            <Tooltip label="Tambah Pegawai Baru" withArrow>
+              <Button 
+                leftSection={<IconPlus size={18} />} 
+                color="blue" 
+                variant="light" 
+                onClick={() => router.push('/admin/ppid/struktur-ppid/pegawai/create')}
+              >
+                Tambah Baru
+              </Button>
+            </Tooltip>
+          </Group>
+          <Center py="xl">
+            <Text c="dimmed">Tidak ada data pegawai yang ditemukan</Text>
+          </Center>
+        </Paper>
       </Box>
     );
   }
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'} h={{base: 770, md: 650}}>
-        <JudulList
-          title='List Pegawai'
-          href='/admin/ppid/struktur-ppid/pegawai/create'
-        />
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Pegawai PPID</Title>
+          <Tooltip label="Tambah Pegawai Baru" withArrow>
+            <Button 
+              leftSection={<IconPlus size={18} />} 
+              color="blue" 
+              variant="light" 
+              onClick={() => router.push('/admin/ppid/struktur-ppid/pegawai/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
         <Box style={{ overflowX: "auto" }}>
-          <Table striped withTableBorder withRowBorders>
+          <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh>Nama</TableTh>
-                <TableTh>Gelar Akademik</TableTh>
-                <TableTh>Telepon</TableTh>
-                <TableTh>Posisi</TableTh>
-                <TableTh>Aktif</TableTh>
-                <TableTh>Detail</TableTh>
+                <TableTh style={{ width: '25%' }}>Nama Lengkap</TableTh>
+                <TableTh style={{ width: '20%' }}>Posisi</TableTh>
+                <TableTh style={{ width: '10%' }}>Status</TableTh>
+                <TableTh style={{ width: '10%' }}>Aksi</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
@@ -112,10 +116,20 @@ function ListPegawaiPPID({ search }: { search: string }) {
                 }) // Aktif di atas
               ).map((item) => (
                 <TableTr key={item.id}>
-                  <TableTd>{item.namaLengkap}</TableTd>
-                  <TableTd>{item.gelarAkademik}</TableTd>
-                  <TableTd>{item.telepon}</TableTd>
-                  <TableTd>{item.posisi?.nama}</TableTd>
+                  <TableTd>
+                    <Box w={200}>
+                      <Text fw={500} truncate="end" lineClamp={1}>
+                        {item.namaLengkap}
+                      </Text>
+                    </Box>
+                  </TableTd>
+                  <TableTd>
+                    <Box w={200}>
+                      <Badge variant="light" color="blue">
+                        {item.posisi?.nama || 'Belum diatur'}
+                      </Badge>
+                    </Box>
+                  </TableTd>
                   <TableTd>
                     <Group gap="xs" wrap="nowrap">
                       <Box visibleFrom="sm">
@@ -137,8 +151,13 @@ function ListPegawaiPPID({ search }: { search: string }) {
                     </Group>
                   </TableTd>
                   <TableTd>
-                    <Button bg={"green"} onClick={() => router.push(`/admin/ppid/struktur-ppid/pegawai/${item.id}`)}>
-                      <IconDeviceImacCog size={25} />
+                    <Button
+                      variant="light"
+                      color="blue"
+                      onClick={() => router.push(`/admin/ppid/struktur-ppid/pegawai/${item.id}`)}
+                      size="sm"
+                    >
+                      <IconDeviceImacCog size={20} />
                     </Button>
                   </TableTd>
                 </TableTr>
@@ -146,19 +165,20 @@ function ListPegawaiPPID({ search }: { search: string }) {
             </TableTbody>
           </Table>
         </Box>
+        <Center mt="lg">
+          <Pagination
+            value={page}
+            onChange={(newPage) => {
+              load(newPage, 10);
+              window.scrollTo(0, 0);
+            }}
+            total={totalPages}
+            withEdges
+            withControls
+            radius="md"
+          />
+        </Center>
       </Paper>
-     <Center>
-     <Pagination
-        value={page}
-        onChange={(newPage) => {
-          load(newPage, 10);
-          window.scrollTo(0, 0); 
-        }}
-        total={totalPages}
-        mt="md"
-        mb="md"
-      />
-     </Center>
     </Box>
   );
 }
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/[id]/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/[id]/page.tsx
index 617aa57e..fa100eb4 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/[id]/page.tsx
@@ -1,9 +1,9 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
 import stateStrukturPPID from '@/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -77,24 +77,39 @@ function EditPosisiOrganisasiPPID() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Posisi Organisasi PPID
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Posisi Organisasi PPID</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label="Nama Posisi Organisasi"
+            placeholder="Masukkan nama posisi organisasi"
             value={formData.nama}
             onChange={(e) => setFormData({ ...formData, nama: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Posisi Organisasi</Text>}
-            placeholder='Masukkan nama posisi organisasi'
+            required
           />
+          
           <Box>
-            <Text fz={"md"} fw={"bold"}>Deskripsi</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi
+            </Text>
             <EditEditor
               value={formData.deskripsi}
               onChange={(htmlContent) => {
@@ -102,14 +117,34 @@ function EditPosisiOrganisasiPPID() {
               }}
             />
           </Box>
+          
           <TextInput
+            label="Hierarki"
+            type="number"
+            min={0}
+            placeholder="Contoh: 1 (Angka semakin kecil, posisi semakin tinggi)"
             value={formData.hierarki}
-            onChange={(e) => setFormData({ ...formData, hierarki: parseInt(e.target.value) })}
-            label={<Text fw={"bold"} fz={"sm"}>Hierarki</Text>}
-            placeholder='Masukkan hierarki'
+            onChange={(e) => {
+              const value = parseInt(e.target.value, 10);
+              setFormData({ ...formData, hierarki: isNaN(value) ? 0 : value });
+            }}
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={handleSubmit}
+              loading={stateOrganisasi.edit.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/create/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/create/page.tsx
index 39a47477..495ea1bc 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/create/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/create/page.tsx
@@ -1,82 +1,127 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
 import stateStrukturPPID from '@/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
+import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
 function CreatePosisiOrganisasiPPID() {
-    const router = useRouter();
-    const stateOrganisasi = useProxy(stateStrukturPPID.posisiOrganisasi)
-    useEffect(() => {
-        stateOrganisasi.findMany.load();
-    }, []);
-
-    const resetForm = () => {
-        stateOrganisasi.create.form = {
-            nama: "",
-            deskripsi: "",
-            hierarki: 0, // Initialize as 0 to allow any number input
-        };
+  const router = useRouter();
+  const stateOrganisasi = useProxy(stateStrukturPPID.posisiOrganisasi);
+  
+  useEffect(() => {
+    stateOrganisasi.findMany.load();
+    // Initialize form with default values
+    stateOrganisasi.create.form = {
+      nama: "",
+      deskripsi: "",
+      hierarki: 0,
     };
-
-    const handleSubmit = async () => {
-        await stateOrganisasi.create.submit();
-        resetForm();
-        router.push("/admin/ppid/struktur-ppid/posisi-organisasi")
+    
+    return () => {
+      // Clean up form on unmount
+      stateOrganisasi.create.form = {
+        nama: "",
+        deskripsi: "",
+        hierarki: 0,
+      };
     };
+  }, []);
 
-    return (
-        <Box>
-            <Box mb={10}>
-                <Button variant="subtle" onClick={() => router.back()}>
-                    <IconArrowBack color={colors['blue-button']} size={25} />
-                </Button>
-            </Box>
-            <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-                <Stack gap={"xs"}>
-                    <Title order={3}>Create Posisi Organisasi PPID</Title>
-                    <TextInput
-                        label="Nama Posisi"
-                        placeholder="Contoh: Kepala Desa"
-                        value={stateOrganisasi.create.form.nama}
-                        onChange={(e) => (stateOrganisasi.create.form.nama = e.currentTarget.value)}
-                    />
-                    <Box>
-                        <Text fz={"md"} fw={"bold"}>Deskripsi</Text>
-                        <CreateEditor
-                            value={stateOrganisasi.create.form.deskripsi}
-                            onChange={(htmlContent) => {
-                                stateOrganisasi.create.form.deskripsi = htmlContent;
-                            }}
-                        />
-                    </Box>
-                    <TextInput
-                        label="Hierarki"
-                        type="number"
-                        placeholder="Contoh: 1"
-                        value={stateOrganisasi.create.form.hierarki}
-                        onChange={(e) => {
-                            const value = parseInt(e.currentTarget.value, 10);
-                            if (!isNaN(value)) {
-                                stateOrganisasi.create.form.hierarki = value;
-                            }
-                        }}
-                    />
-                    <Button
-                        onClick={handleSubmit}
-                        color="blue"
-                    >
-                        Simpan
-                    </Button>
-                </Stack>
-            </Paper>
-        </Box>
-    );
+  const handleSubmit = async () => {
+    try {
+      if (!stateOrganisasi.create.form.nama.trim()) {
+        return toast.error('Nama posisi tidak boleh kosong');
+      }
+      
+      await stateOrganisasi.create.submit();
+      toast.success('Posisi organisasi berhasil ditambahkan');
+      router.push('/admin/ppid/struktur-ppid/posisi-organisasi');
+    } catch (error) {
+      toast.error('Gagal menambahkan posisi organisasi');
+      console.error('Error:', error);
+    }
+  };
+
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Posisi Organisasi PPID
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Posisi"
+            placeholder="Contoh: Kepala Desa"
+            value={stateOrganisasi.create.form.nama}
+            onChange={(e) => (stateOrganisasi.create.form.nama = e.target.value)}
+            required
+          />
+          
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi
+            </Text>
+            <CreateEditor
+              value={stateOrganisasi.create.form.deskripsi}
+              onChange={(htmlContent) => {
+                stateOrganisasi.create.form.deskripsi = htmlContent;
+              }}
+            />
+          </Box>
+          
+          <TextInput
+            label="Hierarki"
+            type="number"
+            min={0}
+            placeholder="Contoh: 1 (Angka semakin kecil, posisi semakin tinggi)"
+            value={stateOrganisasi.create.form.hierarki || ''}
+            onChange={(e) => {
+              const value = parseInt(e.target.value, 10);
+              stateOrganisasi.create.form.hierarki = isNaN(value) ? 0 : value;
+            }}
+            required
+          />
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={handleSubmit}
+              loading={stateOrganisasi.create.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
 }
 
 export default CreatePosisiOrganisasiPPID;
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/page.tsx
index 0ae300f3..cccc9676 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/posisi-organisasi/page.tsx
@@ -1,13 +1,12 @@
-/* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import stateStrukturPPID from '../../../_state/ppid/struktur_ppid/struktur_PPID';
 
@@ -17,7 +16,7 @@ function PosisiOrganisasiPPID() {
     <Box>
       <HeaderSearch
         title='Posisi Organisasi PPID'
-        placeholder='pencarian'
+        placeholder='Cari posisi organisasi...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -41,7 +40,7 @@ function ListPosisiOrganisasiPPID({ search }: { search: string }) {
     load,
   } = stateOrganisasi.findMany;
 
-  useEffect(() => {
+  useShallowEffect(() => {
     load(page, 10, search);
   }, [page, search]);
 
@@ -58,64 +57,88 @@ function ListPosisiOrganisasiPPID({ search }: { search: string }) {
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Posisi Organisasi PPID'
-          href='/admin/ppid/struktur-ppid/posisi-organisasi/create'
-        />
-        <Box style={{ overflowY: 'auto', maxHeight: '400px' }}>
-          <Table striped withTableBorder withRowBorders>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Posisi Organisasi PPID</Title>
+          <Tooltip label="Tambah Posisi Organisasi" withArrow>
+            <Button 
+              leftSection={<IconPlus size={18} />} 
+              color="blue" 
+              variant="light" 
+              onClick={() => router.push('/admin/ppid/struktur-ppid/posisi-organisasi/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh>Nama Posisi</TableTh>
-                <TableTh>Deskripsi</TableTh>
-                <TableTh>Hierarki</TableTh>
-                <TableTh>Edit</TableTh>
-                <TableTh>Hapus</TableTh>
+                <TableTh style={{ width: '25%' }}>Nama Posisi</TableTh>
+                <TableTh style={{ width: '45%' }}>Deskripsi</TableTh>
+                <TableTh style={{ width: '15%' }}>Hierarki</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
               </TableTr>
             </TableThead>
-            <TableTbody >
-              {filteredData.map((item) => (
-                <TableTr key={item.id}>
-                  <TableTd>{item.nama}</TableTd>
-                  <TableTd>
-                    <Text truncate dangerouslySetInnerHTML={{ __html: item.deskripsi ?? "" }} />
-                  </TableTd>
-                  <TableTd>{item.hierarki}</TableTd>
-                  <TableTd>
-                    <Button color="green"
-                      onClick={() => {
-                        if (item) {
-                          router.push(`/admin/ppid/struktur-ppid/posisi-organisasi/${item.id}`);
-                        }
-                      }}
-                    >
-                      <IconEdit size={20} />
-                    </Button>
-                  </TableTd>
-                  <TableTd>
-                    <Button color="red"
-                      onClick={() => {
-                        if (item) {
-                          setSelectedId(item.id);
-                          setModalHapus(true);
-                        }
-                      }}
-                      disabled={!item}
-
-                    >
-                      <IconTrash size={20} />
-                    </Button>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd style={{ width: '25%' }}>
+                      <Text fw={500} truncate="end" lineClamp={1}>{item.nama}</Text>
+                    </TableTd>
+                    <TableTd style={{ width: '45%' }}>
+                      <Text lineClamp={2} fz="sm" c="dimmed" dangerouslySetInnerHTML={{ __html: item.deskripsi || '-' }} />
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Text>{item.hierarki || '-'}</Text>
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Group gap="xs">
+                        <Tooltip label="Edit" withArrow>
+                          <Button
+                            variant="light"
+                            color="green"
+                            size="sm"
+                            onClick={() => router.push(`/admin/ppid/struktur-ppid/posisi-organisasi/${item.id}`)}
+                          >
+                            <IconEdit size={18} />
+                          </Button>
+                        </Tooltip>
+                        <Tooltip label="Hapus" withArrow>
+                          <Button
+                            variant="light"
+                            color="red"
+                            size="sm"
+                            onClick={() => {
+                              setSelectedId(item.id);
+                              setModalHapus(true);
+                            }}
+                          >
+                            <IconTrash size={18} />
+                          </Button>
+                        </Tooltip>
+                      </Group>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data posisi organisasi yang cocok</Text>
+                    </Center>
                   </TableTd>
                 </TableTr>
-              ))}
+              )}
             </TableTbody>
           </Table>
         </Box>
@@ -123,9 +146,15 @@ function ListPosisiOrganisasiPPID({ search }: { search: string }) {
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
           total={totalPages}
-          my={"md"}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
       {/* Modal Hapus */}
diff --git a/src/app/admin/(dashboard)/ppid/struktur-ppid/struktur-organisasi/page.tsx b/src/app/admin/(dashboard)/ppid/struktur-ppid/struktur-organisasi/page.tsx
index e4fd8370..5aa51441 100644
--- a/src/app/admin/(dashboard)/ppid/struktur-ppid/struktur-organisasi/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/struktur-ppid/struktur-organisasi/page.tsx
@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import colors from '@/con/colors';
-import { Box, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Center, Image, Loader, Paper, Stack, Text, Tooltip } from '@mantine/core';
+import { IconUsers } from '@tabler/icons-react';
 import { OrganizationChart } from 'primereact/organizationchart';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -11,46 +11,50 @@ import stateStrukturPPID from '../../../_state/ppid/struktur_ppid/struktur_PPID'
 
 function StrukturOrganisasiPPID() {
   return (
-    <Box >
+    <Box py="md">
       <ListStrukturOrganisasiPPID />
     </Box>
   );
 }
 
 function ListStrukturOrganisasiPPID() {
-  const stateOrganisasi = useProxy(stateStrukturPPID.pegawai)
+  const stateOrganisasi = useProxy(stateStrukturPPID.pegawai);
 
   useEffect(() => {
-    stateOrganisasi.findMany.load()
-  }, [])
+    stateOrganisasi.findMany.load();
+  }, []);
+
+  if (stateOrganisasi.findMany.loading) {
+    return (
+      <Center py={40}>
+        <Loader size="lg" />
+      </Center>
+    );
+  }
 
   if (!stateOrganisasi.findMany.data || stateOrganisasi.findMany.data.length === 0) {
     return (
-      <Stack py={10}>
-        <Skeleton h={500} />
+      <Stack align="center" py={60} gap="sm">
+        <IconUsers size={60} stroke={1.5} color="var(--mantine-color-gray-6)" />
+        <Text fw={500} c="dimmed">Belum ada struktur organisasi yang ditambahkan</Text>
       </Stack>
     );
   }
 
-  // Step 1: Group pegawai berdasarkan posisiId
   const posisiMap = new Map<string, any>();
-
   for (const pegawai of stateOrganisasi.findMany.data) {
     const posisiId = pegawai.posisi.id;
     if (!posisiMap.has(posisiId)) {
       posisiMap.set(posisiId, {
         ...pegawai.posisi,
         pegawaiList: [],
-        children: []
+        children: [],
       });
     }
     posisiMap.get(posisiId)!.pegawaiList.push(pegawai);
   }
-  
 
-  // Step 2: Buat struktur pohon berdasarkan parentId
   let root: any[] = [];
-
   posisiMap.forEach((posisi) => {
     if (posisi.parentId) {
       const parent = posisiMap.get(posisi.parentId);
@@ -62,56 +66,64 @@ function ListStrukturOrganisasiPPID() {
     }
   });
 
-  // Step 3: Ubah struktur ke format OrganizationChart
   function toOrgChartFormat(node: any): any {
     return {
       expanded: true,
       type: 'person',
       styleClass: 'p-person',
       data: {
-        name: node.pegawaiList?.[0]?.namaLengkap || 'Tidak ada pegawai',
+        name: node.pegawaiList?.[0]?.namaLengkap || 'Belum ada pegawai',
         status: node.nama,
-        image: node.pegawaiList?.[0]?.image?.link || '/img/default.png'
+        image: node.pegawaiList?.[0]?.image?.link || '/img/default.png',
       },
-      children: node.children.map(toOrgChartFormat)
+      children: node.children.map(toOrgChartFormat),
     };
   }
-  
 
   const chartData = root.map(toOrgChartFormat);
 
   return (
     <Box py={10}>
-      <Paper bg={colors.grey} p="md" style={{overflowX: 'auto'}}>
+      <Paper
+        p="md"
+        radius="lg"
+        shadow="md"
+        withBorder
+        style={{
+          overflowX: 'auto',
+          background: 'linear-gradient(135deg, #ffffff 0%, #f8f9fa 100%)',
+        }}
+      >
         <OrganizationChart value={chartData} nodeTemplate={nodeTemplate} />
       </Paper>
     </Box>
   );
 }
 
-
 function nodeTemplate(node: any) {
   const imageSrc = node?.data?.image || '/img/default.png';
   const name = node?.data?.name || 'Tanpa Nama';
   const status = node?.data?.status || 'Tidak ada deskripsi';
 
   return (
-    <Stack align="center" gap={4}>
-      <Image
-        src={imageSrc}
-        alt={name}
-        radius="xl"
-        w={120}
-        h={120}
-        fit="cover"
-      />
-      <Text fw={600} ta="center">{name}</Text>
-      <Text size="sm" c="dimmed" ta="center">{status}</Text>
+    <Stack align="center" gap={6} p="sm" style={{ minWidth: 160 }}>
+      <Tooltip label={name} position="top" withArrow>
+        <Image
+          src={imageSrc}
+          alt={name}
+          radius="xl"
+          w={100}
+          h={100}
+          fit="cover"
+          style={{
+            border: '1px solid #D3D1D1FF',
+          }}
+        />
+      </Tooltip>
+      <Text fw={600} ta="center" size="sm">{name}</Text>
+      <Text size="xs" c="dimmed" ta="center">{status}</Text>
     </Stack>
   );
 }
 
-
-
-
 export default StrukturOrganisasiPPID;
diff --git a/src/app/admin/(dashboard)/ppid/visi-misi-ppid/edit/page.tsx b/src/app/admin/(dashboard)/ppid/visi-misi-ppid/edit/page.tsx
index df696fe3..a3495b9c 100644
--- a/src/app/admin/(dashboard)/ppid/visi-misi-ppid/edit/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/visi-misi-ppid/edit/page.tsx
@@ -1,11 +1,6 @@
-'use client'
+'use client';
 import colors from '@/con/colors';
-import {
-  Box,
-  Button, Group, Paper,
-  Stack,
-  Title
-} from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -46,35 +41,52 @@ function VisiMisiPPIDEdit() {
   };
 
   return (
-    <Box>
-      <Stack gap={'xs'}>
-        <Box>
-          <Button
-            variant={'subtle'}
-            onClick={() => router.back()}
-          >
-            <IconArrowBack color={colors['blue-button']} size={20} />
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
-        </Box>
-        <Box>
-          <Paper bg={colors['white-1']} p={'md'} radius={10} w={{ base: '100%', md: '50%' }}>
-            <Stack gap={'xs'}>
-              <Title order={3}>Edit Visi Misi PPID</Title>
-              <VisiPPID value={draftVisi} onChange={setDraftVisi} />
-              <MisiPPID value={draftMisi} onChange={setDraftMisi} />
-              <Group>
-                <Button
-                  bg={colors['blue-button']}
-                  onClick={submit}
-                  loading={visiMisi.update.loading}
-                >
-                  Submit
-                </Button>
-              </Group>
-            </Stack>
-          </Paper>
-        </Box>
-      </Stack>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Visi Misi PPID
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="xl">
+          <Box>
+            <VisiPPID value={draftVisi} onChange={setDraftVisi} />
+          </Box>
+          
+          <Box>
+            <MisiPPID value={draftMisi} onChange={setDraftMisi} />
+          </Box>
+
+          <Group justify="flex-end" mt="md">
+            <Button
+              onClick={submit}
+              loading={visiMisi.update.loading}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
     </Box>
   );
 }
diff --git a/src/app/admin/(dashboard)/ppid/visi-misi-ppid/page.tsx b/src/app/admin/(dashboard)/ppid/visi-misi-ppid/page.tsx
index 362d72db..e80c479c 100644
--- a/src/app/admin/(dashboard)/ppid/visi-misi-ppid/page.tsx
+++ b/src/app/admin/(dashboard)/ppid/visi-misi-ppid/page.tsx
@@ -1,21 +1,11 @@
-'use client'
+'use client';
 import colors from '@/con/colors';
-import {
-  Box,
-  Button,
-  Center,
-  Grid,
-  GridCol,
-  Image,
-  Paper,
-  Skeleton, Stack, Text,
-  Title
-} from '@mantine/core';
+import { Box, Button, Center, Divider, Grid, GridCol, Image, Paper, Skeleton, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { useProxy } from 'valtio/utils';
-import stateVisiMisiPPID from '../../_state/ppid/visi_misi_ppid/visimisiPPID';
 import { IconEdit } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
+import { useProxy } from 'valtio/utils';
+import stateVisiMisiPPID from '../../_state/ppid/visi_misi_ppid/visimisiPPID';
 
 
 function VisiMisiPPIDList() {
@@ -25,56 +15,99 @@ function VisiMisiPPIDList() {
     listVisiMisi.findById.load('1');
   }, []);
 
+  if (listVisiMisi.findById.loading) {
+    return (
+      <Center py={40}>
+        <Skeleton radius="md" height={800} width="100%" />
+      </Center>
+    );
+  }
+
   if (!listVisiMisi.findById.data) {
     return (
-      <Stack>
-        <Skeleton radius={10} h={800} />
-      </Stack>
+      <Center py={60}>
+        <Stack align="center" gap="sm">
+          <Text fw={500} c="dimmed">Belum ada data visi misi PPID</Text>
+        </Stack>
+      </Center>
     );
   }
 
   return (
-    <Paper bg={colors['white-1']} p={'md'} radius={10}>
-      <Stack pos={"relative"} gap={"22"}>
-        <Grid>
+    <Paper bg={colors['white-1']} p="lg" radius="md" shadow="sm">
+      <Stack gap="md">
+        <Grid align="center">
           <GridCol span={{ base: 12, md: 11 }}>
-            <Title order={3}>Preview Visi Misi PPID</Title>
+            <Title order={3} c={colors['blue-button']}>Preview Visi Misi PPID</Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 1 }}>
-            <Button bg={colors['blue-button']} onClick={() => router.push('/admin/ppid/visi-misi-ppid/edit')}>
-              <IconEdit size={16} />
-            </Button>
+            <Tooltip label="Edit Visi Misi PPID" withArrow>
+              <Button
+                c="green"
+                variant="light"
+                leftSection={<IconEdit size={18} stroke={2} />}
+                radius="md"
+                onClick={() => router.push('/admin/ppid/visi-misi-ppid/edit')}
+              >
+                Edit
+              </Button>
+            </Tooltip>
           </GridCol>
         </Grid>
-        <Box>
-          <Stack gap={'lg'}>
-            <Paper p={"xl"} bg={colors['BG-trans']}>
-              <Box pb={30}>
+
+        <Paper p="xl" bg={'white'} withBorder radius="md" shadow="xs">
+          <Box px={{ base: 'sm', md: 100 }}>
+            <Grid>
+              <GridCol span={12}>
                 <Center>
-                  <Image src={"/darmasaba-icon.png"} w={{ base: 100, md: 150 }} alt='' />
+                  <Image src="/darmasaba-icon.png" w={{ base: 100, md: 150 }} alt="Logo PPID" />
                 </Center>
-                <Text ta={"center"} fz={{ base: "h2", md: "2.5rem" }} fw={"bold"}>
+              </GridCol>
+              <GridCol span={12}>
+                <Text ta="center" fz={{ base: '1.2rem', md: '1.8rem' }} fw="bold" c={colors['blue-button']}>
                   MOTO PPID DESA DARMASABA
                 </Text>
-                <Text ta={"center"} fz={{ base: "h4", md: "h3" }} >
+                <Text ta="center" fz={{ base: '1rem', md: '1.2rem' }} c="dimmed" mt="sm">
                   MEMBERIKAN INFORMASI YANG CEPAT, MUDAH, TEPAT DAN TRANSPARAN
                 </Text>
-              </Box>
-              <Box px={{ base: 20, md: 50 }} pb={30}>
-                <Text ta={"center"} fz={{ base: "h3", md: "h2" }} fw={"bold"}>
-                  VISI PPID
-                </Text>
-                <Text fz={{ base: "md", md: "h3" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: listVisiMisi.findById.data.visi }} />
-              </Box>
-              <Box px={{ base: 20, md: 50 }}>
-                <Text ta={"center"} fz={{ base: "h3", md: "h2" }} fw={"bold"}>
-                  MISI PPID
-                </Text>
-                <Text fz={{ base: "md", md: "h3" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: listVisiMisi.findById.data.misi }} />
-              </Box>
-            </Paper>
-          </Stack>
-        </Box>
+              </GridCol>
+            </Grid>
+
+            <Divider my="xl" color={colors['blue-button']} />
+
+            <Box>
+              <Text fz={{ base: '1.5rem', md: '1.75rem' }} fw="bold" ta="center" mb="lg" c={colors['blue-button']}>
+                VISI PPID
+              </Text>
+              <Box 
+                className="prose max-w-none"
+                dangerouslySetInnerHTML={{ __html: listVisiMisi.findById.data.visi }}
+                style={{
+                  fontSize: '1.1rem',
+                  lineHeight: 1.7,
+                  textAlign: 'justify'
+                }}
+              />
+            </Box>
+
+            <Divider my="xl" color={colors['blue-button']} />
+
+            <Box mt="xl">
+              <Text fz={{ base: '1.5rem', md: '1.75rem' }} fw="bold" ta="center" mb="lg" c={colors['blue-button']}>
+                MISI PPID
+              </Text>
+              <Box 
+                className="prose max-w-none"
+                dangerouslySetInnerHTML={{ __html: listVisiMisi.findById.data.misi }}
+                style={{
+                  fontSize: '1.1rem',
+                  lineHeight: 1.7,
+                  textAlign: 'justify'
+                }}
+              />
+            </Box>
+          </Box>
+        </Paper>
       </Stack>
     </Paper>
   );
diff --git a/src/app/darmasaba/(tambahan)/program-inovasi/[id]/page.tsx b/src/app/darmasaba/(tambahan)/program-inovasi/[id]/page.tsx
new file mode 100644
index 00000000..7c6187da
--- /dev/null
+++ b/src/app/darmasaba/(tambahan)/program-inovasi/[id]/page.tsx
@@ -0,0 +1,97 @@
+'use client'
+import profileLandingPageState from '@/app/admin/(dashboard)/_state/landing-page/profile';
+import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
+import colors from '@/con/colors';
+import { Badge, Box, Image, Paper, Skeleton, Stack, Text, Title } from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconSparkles } from '@tabler/icons-react';
+import { useParams } from 'next/navigation';
+import { useProxy } from 'valtio/utils';
+
+function Page() {
+  const params = useParams();
+  const id = params?.id as string;
+  const state = useProxy(profileLandingPageState.programInovasi);
+
+  const { data } = state.findUnique;
+
+  useShallowEffect(() => {
+    if (id) {
+      state.findUnique.load(id);
+    }
+  }, [id]);
+
+  if (!data) {
+    return (
+      <Box p="xl">
+        <Skeleton h={400} radius="lg" />
+        <Skeleton mt="md" h={30} radius="sm" />
+        <Skeleton mt="sm" h={20} w="80%" radius="sm" />
+      </Box>
+    );
+  }
+
+  return (
+    <Stack bg={colors.Bg} py="xl" gap="xl">
+      <Box px={{ base: 'md', md: 100 }}>
+        <BackButton />
+      </Box>
+
+      <Paper
+        shadow="sm"
+        radius="xl"
+        p={{ base: 'md', md: 'xl' }}
+        mx="auto"
+        w="100%"
+        maw={1000}
+        bg="white"
+        style={{ border: '1px solid var(--mantine-color-gray-2)' }}
+      >
+        <Stack align="center" gap="md">
+          <Badge
+            leftSection={<IconSparkles size={16} />}
+            variant="gradient"
+            gradient={{ from: 'blue', to: 'cyan' }}
+            size="lg"
+            radius="lg"
+          >
+            Program Inovasi
+          </Badge>
+          <Title
+            order={1}
+            fz={{ base: '2rem', md: '2.8rem' }}
+            fw={800}
+            ta="center"
+            style={{ lineHeight: 1.3 }}
+          >
+            {data?.name}
+          </Title>
+
+          {data.image && (
+            <Image
+              src={data.image?.link}
+              alt={data.name}
+              fit="contain"
+              mah={400}
+              maw="80%"
+              radius="lg"
+              style={{
+                boxShadow: '0 0 25px rgba(0, 190, 255, 0.25)',
+              }}
+            />
+          )}
+
+          <Text
+            fz={{ base: 'md', md: 'lg' }}
+            c="dimmed"
+            mt="sm"
+            lh={1.7}
+            dangerouslySetInnerHTML={{ __html: data?.description || '-' }}
+          />
+        </Stack>
+      </Paper>
+    </Stack>
+  );
+}
+
+export default Page;
diff --git a/src/app/darmasaba/_com/main-page/landing-page/ModuleView.tsx b/src/app/darmasaba/_com/main-page/landing-page/ModuleView.tsx
index b8ac4c36..4313202c 100644
--- a/src/app/darmasaba/_com/main-page/landing-page/ModuleView.tsx
+++ b/src/app/darmasaba/_com/main-page/landing-page/ModuleView.tsx
@@ -15,7 +15,7 @@ function ModuleItem({ data }: { data: ProgramInovasiItem }) {
     <motion.div whileHover={{ scale: 1.04 }}>
       <Tooltip label={`Lihat ${data.name}`} withArrow>
         <Paper
-          onClick={() => router.push(`/${data.name}`)}
+          onClick={() => router.push(`/darmasaba/program-inovasi/${data.id}`)}
           p="xl"
           radius="2xl"
           bg="white"