diff --git a/app/(application)/discussion/member/[id].tsx b/app/(application)/discussion/member/[id].tsx
index 7dae308..5e0b107 100644
--- a/app/(application)/discussion/member/[id].tsx
+++ b/app/(application)/discussion/member/[id].tsx
@@ -1,21 +1,18 @@
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalConfirmation from "@/components/ModalConfirmation";
-import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from '@/components/Text';
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { Feather, MaterialCommunityIcons } from "@expo/vector-icons";
+import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
@@ -25,6 +22,8 @@ type Props = {
    img: string
 }
 
+const SKELETON_COUNT = 5
+
 export default function MemberDiscussionDetail() {
    const { token, decryptToken } = useAuthSession()
    const { colors } = useTheme();
@@ -35,13 +34,12 @@ export default function MemberDiscussionDetail() {
    const [chooseUser, setChooseUser] = useState({ idUser: '', name: '', img: '' })
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
-   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [showDeleteModal, setShowDeleteModal] = useState(false)
+   const canManage = entityUser.role !== "user" && entityUser.role !== "coadmin"
 
-
-   async function handleLoad(loading: boolean) {
+   async function handleLoad(showLoadingIndicator: boolean) {
       try {
-         setLoading(loading)
+         setLoading(showLoadingIndicator)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDiscussionGeneralOne({ id: id, user: hasil, cat: 'anggota' })
          setData(response.data)
@@ -52,26 +50,18 @@ export default function MemberDiscussionDetail() {
       }
    }
 
-   useEffect(() => {
-      handleLoad(false)
-   }, [update]);
-
-
-   useEffect(() => {
-      handleLoad(true)
-   }, []);
+   useEffect(() => { handleLoad(false) }, [update]);
+   useEffect(() => { handleLoad(true) }, []);
 
    async function handleDeleteUser() {
       try {
          const hasil = await decryptToken(String(token?.current))
          await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id)
-         Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi', })
+         Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi' })
          handleLoad(false)
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengeluarkan anggota"
-
-         Toast.show({ type: 'small', text1: message })
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengeluarkan anggota" })
       } finally {
          setModal(false)
       }
@@ -81,9 +71,6 @@ export default function MemberDiscussionDetail() {
       <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Anggota Diskusi',
-               headerTitleAlign: 'center',
                header: () => (
                   <AppHeader
                      title="Anggota Diskusi"
@@ -93,49 +80,82 @@ export default function MemberDiscussionDetail() {
                )
             }}
          />
-         <ScrollView style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
-            <View style={[Styles.p15]}>
-               <Text style={[Styles.textDefault, Styles.mv05]}>{data.length} Anggota</Text>
-               <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                  {
-                     entityUser.role != "user" && entityUser.role != "coadmin" &&
-                     <BorderBottomItem
-                        onPress={() => { router.push(`/discussion/add-member/${id}`) }}
-                        borderType="none"
-                        icon={
-                           <View style={[Styles.iconContent, ColorsStatus.gray]}>
-                              <Feather name="user-plus" size={25} color={'#384288'} />
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+            <View style={[Styles.p15, Styles.mb100]}>
+
+               {/* Tombol tambah anggota */}
+               {canManage && (
+                  <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.mb15,
+                     { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                     <Pressable
+                        onPress={() => router.push(`/discussion/add-member/${id}`)}
+                        style={Styles.sectionActionRow}
+                     >
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '18' }]}>
+                           <MaterialCommunityIcons name="account-plus-outline" size={18} color={colors.icon} />
+                        </View>
+                        <View style={Styles.flex1}>
+                           <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Tambah Anggota</Text>
+                        </View>
+                        <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                     </Pressable>
+                  </View>
+               )}
+
+               {/* Full list */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Anggota</Text>
+                     {!loading && (
+                        <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>{data.length} anggota</Text>
+                     )}
+                  </View>
+                  {loading
+                     ? Array.from({ length: SKELETON_COUNT }).map((_, i) => (
+                        <View
+                           key={i}
+                           style={[Styles.rowItemsCenter, Styles.ph15,
+                              { paddingVertical: 14, gap: 14, borderBottomWidth: i < SKELETON_COUNT - 1 ? 1 : 0, borderBottomColor: colors.icon + '14' }]}
+                        >
+                           <View style={[Styles.userProfileExtraSmall, { backgroundColor: colors.icon + '20', borderRadius: 100 }]} />
+                           <View style={{ height: 13, borderRadius: 6, flex: 1, backgroundColor: colors.icon + '20', maxWidth: 140 + (i % 3) * 30 }} />
+                        </View>
+                     ))
+                     : data.length === 0
+                        ? (
+                           <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
+                              <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
+                              <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
                            </View>
-                        }
-                        title="Tambah Anggota"
-                     />
-                  }
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.map((item, index) => {
-                           return (
-                              <BorderBottomItem
-                                 key={index}
-                                 borderType="bottom"
-                                 icon={
-                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
-                                 }
-                                 title={item.name}
-                                 onPress={() => {
-                                    setChooseUser(item)
-                                    setModal(true)
-                                 }}
-                              />
-                           )
-                        })
+                        )
+                        : data.map((item, index) => (
+                           <Pressable
+                              key={index}
+                              onPress={() => { setChooseUser(item); setModal(true) }}
+                              style={({ pressed }) => [
+                                 Styles.rowItemsCenter, Styles.ph15,
+                                 {
+                                    paddingVertical: 13, gap: 14,
+                                    borderBottomWidth: index < data.length - 1 ? 1 : 0,
+                                    borderBottomColor: colors.icon + '14',
+                                    backgroundColor: pressed ? colors.icon + '0E' : 'transparent',
+                                 },
+                              ]}
+                           >
+                              <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                              <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                 {item.name}
+                              </Text>
+                              <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />
+                           </Pressable>
+                        ))
                   }
                </View>
+
             </View>
          </ScrollView>
 
@@ -149,20 +169,16 @@ export default function MemberDiscussionDetail() {
                      router.push(`/member/${chooseUser.idUser}`)
                   }}
                />
-               {
-                  entityUser.role != "user" && entityUser.role != "coadmin" &&
+               {canManage && (
                   <MenuItemRow
                      icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
                      title="Keluarkan"
                      onPress={() => {
                         setModal(false)
-                        setTimeout(() => {
-                           setShowDeleteModal(true)
-                        }, 600)
+                        setTimeout(() => setShowDeleteModal(true), 600)
                      }}
                   />
-               }
-
+               )}
             </View>
          </DrawerBottom>
 
@@ -170,10 +186,7 @@ export default function MemberDiscussionDetail() {
             visible={showDeleteModal}
             title="Konfirmasi"
             message="Apakah anda yakin ingin mengeluarkan anggota?"
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDeleteUser()
-            }}
+            onConfirm={() => { setShowDeleteModal(false); handleDeleteUser() }}
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx
index 9574196..b9e9951 100644
--- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx
@@ -1,12 +1,9 @@
-import ModalConfirmation from "@/components/ModalConfirmation"
 import AppHeader from "@/components/AppHeader"
-import BorderBottomItem from "@/components/borderBottomItem"
-import ButtonBackHeader from "@/components/buttonBackHeader"
-import HeaderRightCalendarDetail from "@/components/calendar/headerCalendarDetail"
 import DrawerBottom from "@/components/drawerBottom"
+import HeaderRightCalendarDetail from "@/components/calendar/headerCalendarDetail"
 import ImageUser from "@/components/imageNew"
 import MenuItemRow from "@/components/menuItemRow"
-import Skeleton from "@/components/skeleton"
+import ModalConfirmation from "@/components/ModalConfirmation"
 import Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
@@ -14,7 +11,7 @@ import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature }
 import { setUpdateCalendar } from "@/lib/calendarUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { useTheme } from "@/providers/ThemeProvider"
-import { MaterialCommunityIcons } from "@expo/vector-icons"
+import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import Clipboard from "@react-native-clipboard/clipboard"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
@@ -156,135 +153,142 @@ export default function DetailEventCalendar() {
       setRefreshing(false)
    };
 
+   const canManage = !((entityUser.role === "user" || entityUser.role === "coadmin") && !isMemberDivision)
+
+   const repeatLabel: Record<string, string> = {
+      once: 'Acara 1 Kali',
+      daily: 'Setiap Hari',
+      weekly: 'Mingguan',
+      monthly: 'Bulanan',
+      yearly: 'Tahunan',
+   }
+
+   function InfoRow({ icon, label, value, onCopy }: { icon: string, label: string, value?: string, onCopy?: () => void }) {
+      return (
+         <View style={[Styles.sectionActionRow, { paddingVertical: 10, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+            <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+               <MaterialCommunityIcons name={icon as any} size={18} color={colors.dimmed} />
+            </View>
+            <View style={Styles.flex1}>
+               <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed, marginBottom: 2 }]}>{label}</Text>
+               {loading
+                  ? <View style={{ height: 13, borderRadius: 6, backgroundColor: colors.icon + '20', width: '70%' }} />
+                  : <Text style={[Styles.textDefault, { color: colors.text }]}>{value || '-'}</Text>
+               }
+            </View>
+            {onCopy && !loading && value && (
+               <Pressable onPress={onCopy} style={{ padding: 4 }}>
+                  <MaterialCommunityIcons name="content-copy" size={16} color={colors.dimmed} />
+               </Pressable>
+            )}
+         </View>
+      )
+   }
+
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Detail Acara',
-               headerTitleAlign: 'center',
-               // headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
                header: () => (
                   <AppHeader
                      title="Detail Acara"
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
+                        (entityUser.role === "user" || entityUser.role === "coadmin") && !isMemberDivision
+                           ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
                      }
                   />
                )
             }}
          />
          <ScrollView
-            style={[Styles.h100]}
-            refreshControl={
-               <RefreshControl
-                  refreshing={refreshing}
-                  onRefresh={handleRefresh}
-                  tintColor={colors.icon}
-               />
-            }
+            showsVerticalScrollIndicator={false}
+            style={Styles.h100}
+            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
          >
-            <View style={[Styles.p15]}>
-               <View style={[Styles.wrapPaper, Styles.mb15, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                  <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
-                     <MaterialCommunityIcons name="calendar-text" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           : <Text style={[Styles.textDefault, Styles.w90]}>{data?.title}</Text>
-                     }
+            <View style={[Styles.p15, Styles.mb100]}>
 
+               {/* Info acara */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow, Styles.mb15,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+                  <View style={{ padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }}>
+                     <View style={Styles.sectionActionRow}>
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                           <MaterialCommunityIcons name="calendar-text" size={18} color={colors.dimmed} />
+                        </View>
+                        <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Detail Acara</Text>
+                     </View>
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="calendar-month-outline" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           :
-                           <Text style={[Styles.textDefault]}>{data?.dateStart}</Text>
-                     }
+                  <View style={{ paddingHorizontal: 16 }}>
+                     <InfoRow icon="format-title" label="Judul" value={data?.title} />
+                     <InfoRow icon="calendar-month-outline" label="Tanggal" value={data?.dateStart} />
+                     <InfoRow icon="clock-outline" label="Waktu" value={data ? `${data.timeStart} – ${data.timeEnd}` : undefined} />
+                     <InfoRow icon="repeat" label="Pengulangan" value={data?.repeatEventTyper ? repeatLabel[data.repeatEventTyper] : undefined} />
+                     <InfoRow icon="link-variant" label="Link Meet" value={data?.linkMeet} onCopy={data?.linkMeet ? () => handleCopy(data.linkMeet) : undefined} />
+                     <View style={[Styles.sectionActionRow, { paddingVertical: 10, alignItems: 'flex-start' }]}>
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                           <MaterialCommunityIcons name="card-text-outline" size={18} color={colors.dimmed} />
+                        </View>
+                        <View style={Styles.flex1}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed, marginBottom: 2 }]}>Deskripsi</Text>
+                           {loading
+                              ? <View style={{ height: 13, borderRadius: 6, backgroundColor: colors.icon + '20', width: '80%' }} />
+                              : <Text style={[Styles.textDefault, { color: colors.text, lineHeight: 22 }]}>{data?.desc || '-'}</Text>
+                           }
+                        </View>
+                     </View>
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="clock-outline" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           :
-                           <Text style={[Styles.textDefault]}>{data?.timeStart} | {data?.timeEnd}</Text>
-                     }
+               </View>
+
+               {/* Daftar anggota */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+
+                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Anggota</Text>
+                     <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>{member.length} anggota</Text>
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="repeat" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           :
-                           <Text style={[Styles.textDefault]}>
+
+                  {member.length === 0
+                     ? (
+                        <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
+                           <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
+                           <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
+                        </View>
+                     )
+                     : member.map((item, index) => (
+                        <Pressable
+                           key={index}
+                           onPress={() => {
+                              if (!canManage) return
+                              setMemberChoose({ id: item.idUser, name: item.name })
+                              setModalMember(true)
+                           }}
+                           style={({ pressed }) => [
+                              Styles.rowItemsCenter, Styles.ph15,
                               {
-                                 data?.repeatEventTyper.toString() === 'once' ? 'Acara 1 Kali' :
-                                    data?.repeatEventTyper.toString() === 'daily' ? 'Setiap Hari' :
-                                       data?.repeatEventTyper.toString() === 'weekly' ? 'Mingguan' :
-                                          data?.repeatEventTyper.toString() === 'monthly' ? 'Bulanan' :
-                                             data?.repeatEventTyper.toString() === 'yearly' ? 'Tahunan' :
-                                                ''
-                              }
-                           </Text>
-                     }
-                  </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="link-variant" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           :
-                           data?.linkMeet ?
-                              <Pressable onPress={() => { handleCopy(data.linkMeet) }}>
-                                 <Text style={[Styles.textDefault]}>{data.linkMeet}</Text>
-                              </Pressable>
-                              : <Text style={[Styles.textDefault]}>-</Text>
-                     }
-                  </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10, { alignItems: 'flex-start' }]}>
-                     <MaterialCommunityIcons name="card-text-outline" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           :
-                           <Text style={[Styles.textDefault, Styles.w90]}>{data?.desc}</Text>
-                     }
-                  </View>
+                                 paddingVertical: 12, gap: 14,
+                                 borderBottomWidth: index < member.length - 1 ? 1 : 0,
+                                 borderBottomColor: colors.icon + '14',
+                                 backgroundColor: pressed && canManage ? colors.icon + '0E' : 'transparent',
+                              },
+                           ]}
+                        >
+                           <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                           <View style={Styles.flex1}>
+                              <Text style={[Styles.textDefault, { color: colors.text }]} numberOfLines={1}>{item.name}</Text>
+                              <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]} numberOfLines={1}>{item.email}</Text>
+                           </View>
+                           {canManage && <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />}
+                        </Pressable>
+                     ))
+                  }
                </View>
 
-               <View style={[Styles.mb15]}>
-                  <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                     <Text style={[Styles.textDefaultSemiBold]}>Anggota</Text>
-                     <Text style={[Styles.textDefault]}>Total {member.length} Anggota</Text>
-                  </View>
-
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                     {
-                        member.map((item, index) => (
-                           <BorderBottomItem
-                              key={index}
-                              borderType="bottom"
-                              icon={<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />}
-                              title={item.name}
-                              subtitle={item.email}
-                              onPress={() => {
-                                 if ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision) {
-                                    null
-                                 } else {
-                                    setMemberChoose({ id: item.idUser, name: item.name })
-                                    setModalMember(true)
-                                 }
-                              }}
-                           />
-                        ))
-                     }
-                  </View>
-               </View>
             </View>
          </ScrollView>
 
diff --git a/app/(application)/division/[id]/add-member.tsx b/app/(application)/division/[id]/add-member.tsx
index 7c959d5..1b172c4 100644
--- a/app/(application)/division/[id]/add-member.tsx
+++ b/app/(application)/division/[id]/add-member.tsx
@@ -169,7 +169,7 @@ export default function AddMemberDivision() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}
diff --git a/app/(application)/division/[id]/info.tsx b/app/(application)/division/[id]/info.tsx
index b8907be..a967513 100644
--- a/app/(application)/division/[id]/info.tsx
+++ b/app/(application)/division/[id]/info.tsx
@@ -1,20 +1,17 @@
-import ModalConfirmation from "@/components/ModalConfirmation"
 import AppHeader from "@/components/AppHeader"
-import BorderBottomItem from "@/components/borderBottomItem"
-import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
 import DrawerBottom from "@/components/drawerBottom"
+import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
 import ImageUser from "@/components/imageNew"
+import MenuItemRow from "@/components/menuItemRow"
+import ModalConfirmation from "@/components/ModalConfirmation"
 import SectionCancel from "@/components/sectionCancel"
-import Skeleton from "@/components/skeleton"
-import SkeletonTwoItem from "@/components/skeletonTwoItem"
 import Text from "@/components/Text"
-import { ColorsStatus } from "@/constants/ColorsStatus"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiGetDivisionOneFeature, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { useTheme } from "@/providers/ThemeProvider"
-import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
+import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
@@ -50,8 +47,8 @@ export default function InformationDivision() {
    const [dataMember, setDataMember] = useState<PropsMember[]>([])
    const [refresh, setRefresh] = useState(false)
    const update = useSelector((state: any) => state.divisionUpdate)
-   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
+   const SKELETON_COUNT = 5
    const [isMemberDivision, setIsMemberDivision] = useState(false)
    const [isAdminDivision, setIsAdminDivision] = useState(false)
    const [dataMemberChoose, setDataMemberChoose] = useState({
@@ -186,109 +183,123 @@ export default function InformationDivision() {
             }}
          />
          <ScrollView
-            refreshControl={
-               <RefreshControl
-                  refreshing={refreshing}
-                  onRefresh={handleRefresh}
-                  tintColor={colors.icon}
-               />
-            }
+            showsVerticalScrollIndicator={false}
+            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
             style={[Styles.h100, { backgroundColor: colors.background }]}
          >
-            <View style={[Styles.p15]}>
-               {
-                  dataDetail?.isActive == false && (
-                     <SectionCancel title={'Divisi nonaktif'} />
-                  )
-               }
-               <View style={[Styles.mb15]}>
-                  <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Deskripsi Divisi</Text>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
-                     {loading ?
-                        arrSkeleton.map((item, index) => {
+            <View style={[Styles.p15, Styles.mb100]}>
+
+               {dataDetail?.isActive === false && <SectionCancel title="Divisi nonaktif" />}
+
+               {/* Deskripsi */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow, Styles.mb15,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  <View style={[Styles.sectionActionRow, { marginBottom: 12 }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="info-outline" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Deskripsi</Text>
+                  </View>
+                  {loading
+                     ? Array.from({ length: 3 }).map((_, i) => (
+                        <View key={i} style={{ height: 13, borderRadius: 6, marginBottom: 8, backgroundColor: colors.icon + '20', width: i === 2 ? '60%' : '100%' }} />
+                     ))
+                     : <Text style={[Styles.textDefault, { color: colors.text, lineHeight: 22 }]}>{dataDetail?.desc}</Text>
+                  }
+               </View>
+
+               {/* Tombol tambah anggota */}
+               {((entityUser.role !== "user" && entityUser.role !== "coadmin") || isAdminDivision) && dataDetail?.isActive && (
+                  <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.mb15,
+                     { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                     <Pressable
+                        onPress={() => router.push(`/division/${id}/add-member`)}
+                        style={Styles.sectionActionRow}
+                     >
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '18' }]}>
+                           <MaterialCommunityIcons name="account-plus-outline" size={18} color={colors.icon} />
+                        </View>
+                        <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Tambah Anggota</Text>
+                        <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                     </Pressable>
+                  </View>
+               )}
+
+               {/* Daftar anggota */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+
+                  {/* Header */}
+                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Anggota</Text>
+                     {!loading && (
+                        <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>{dataMember.length} anggota</Text>
+                     )}
+                  </View>
+
+                  {loading
+                     ? Array.from({ length: SKELETON_COUNT }).map((_, i) => (
+                        <View key={i} style={[Styles.rowItemsCenter, Styles.ph15,
+                           { paddingVertical: 14, gap: 14, borderBottomWidth: i < SKELETON_COUNT - 1 ? 1 : 0, borderBottomColor: colors.icon + '14' }]}>
+                           <View style={[Styles.userProfileExtraSmall, { backgroundColor: colors.icon + '20', borderRadius: 100 }]} />
+                           <View style={{ height: 13, borderRadius: 6, flex: 1, backgroundColor: colors.icon + '20', maxWidth: 140 + (i % 3) * 30 }} />
+                        </View>
+                     ))
+                     : dataMember.length === 0
+                        ? (
+                           <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
+                              <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
+                              <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
+                           </View>
+                        )
+                        : dataMember.map((item, index) => {
+                           const canPress = dataDetail?.isActive && (isAdminDivision || (entityUser.role !== "user" && entityUser.role !== "coadmin"))
                            return (
-                              <Skeleton key={index} width={100} height={10} widthType="percent" borderRadius={10} />
+                              <Pressable
+                                 key={index}
+                                 onPress={() => canPress && handleChooseMember(item)}
+                                 style={({ pressed }) => [
+                                    Styles.rowItemsCenter, Styles.ph15,
+                                    {
+                                       paddingVertical: 13, gap: 14,
+                                       borderBottomWidth: index < dataMember.length - 1 ? 1 : 0,
+                                       borderBottomColor: colors.icon + '14',
+                                       backgroundColor: pressed && canPress ? colors.icon + '0E' : 'transparent',
+                                    },
+                                 ]}
+                              >
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                 <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                    {item.name}
+                                 </Text>
+                                 <Text style={[Styles.textMediumNormal, { color: item.isAdmin ? colors.tabActive : colors.dimmed }]}>
+                                    {item.isAdmin ? 'Admin' : 'Anggota'}
+                                 </Text>
+                                 {canPress && <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />}
+                              </Pressable>
                            )
                         })
-                        :
-                        <Text>{dataDetail?.desc}</Text>
-                     }
-                  </View>
+                  }
                </View>
-               <View style={[Styles.mb15]}>
-                  <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
-                     {
-                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
-                        dataDetail?.isActive && (
-                           <BorderBottomItem
-                              onPress={() => { router.push(`/division/${id}/add-member`) }}
-                              borderType="none"
-                              icon={
-                                 <View style={[Styles.iconContent]}>
-                                    <Feather name="user-plus" size={25} color={'black'} />
-                                 </View>
-                              }
-                              title="Tambah Anggota"
-                           />
-                        )
-                     }
 
-                     {
-                        loading ?
-                           arrSkeleton.map((item, index) => {
-                              return (
-                                 <SkeletonTwoItem key={index} />
-                              )
-                           })
-                           :
-                           dataMember.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    borderType="bottom"
-                                    onPress={() => { dataDetail?.isActive && (isAdminDivision || (entityUser.role != "user" && entityUser.role != "coadmin")) && handleChooseMember(item) }}
-                                    icon={
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
-                                    }
-                                    title={item.name}
-                                    rightTopInfo={item.isAdmin ? "Admin" : "Anggota"}
-                                 />
-                              )
-                           })
-                     }
-                  </View>
-               </View>
             </View>
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={dataMemberChoose.name}>
-            <View>
-               <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberAdmin() }}>
-                  <View style={[Styles.rowItemsCenter]}>
-                     <View style={[Styles.iconContent]}>
-                        <MaterialIcons name="verified-user" size={25} color={'black'} />
-                     </View>
-                     <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
-                        <View style={[Styles.ml10]}>
-                           <Text style={[Styles.textDefault]}>{dataMemberChoose.isAdmin ? 'Memberhentikan sebagai admin' : 'Jadikan admin'}</Text>
-                        </View>
-                     </View>
-                  </View>
-               </Pressable>
-
-               <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberOut() }}>
-                  <View style={[Styles.rowItemsCenter]}>
-                     <View style={[Styles.iconContent, ColorsStatus.info]}>
-                        <MaterialCommunityIcons name="close-circle" size={25} color={colors.primary} />
-                     </View>
-                     <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
-                        <View style={[Styles.ml10]}>
-                           <Text style={[Styles.textDefault]}>Keluarkan dari divisi</Text>
-                        </View>
-                     </View>
-                  </View>
-               </Pressable>
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<MaterialIcons name="verified-user" color={colors.text} size={25} />}
+                  title={dataMemberChoose.isAdmin ? 'Berhentikan admin' : 'Jadikan admin'}
+                  onPress={handleMemberAdmin}
+               />
+               <MenuItemRow
+                  icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
+                  title="Keluarkan"
+                  onPress={handleMemberOut}
+               />
             </View>
          </DrawerBottom>