diff --git a/src/module/announcement/component/ui/navbar_create_announcement.tsx b/src/module/announcement/component/ui/navbar_create_announcement.tsx
deleted file mode 100644
index cb25c3e..0000000
--- a/src/module/announcement/component/ui/navbar_create_announcement.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-import { LayoutIconBack, LayoutNavbarHome } from "@/module/_global";
-import { Box, Grid, Text } from "@mantine/core";
-
-export default function NavbarCreateAnnouncement() {
-   return (
-      <Box>
-         <LayoutNavbarHome>
-            <Grid justify='center' align='center'>
-               <Grid.Col span="auto">
-                  <LayoutIconBack />
-               </Grid.Col>
-               <Grid.Col span={6}>
-                  <Text ta={'center'} fw={'bold'} c={'white'}>Tambah Pengumuman</Text>
-               </Grid.Col>
-               <Grid.Col span="auto"></Grid.Col>
-            </Grid>
-         </LayoutNavbarHome>
-      </Box>
-   )
-}
\ No newline at end of file
diff --git a/src/module/announcement/component/ui/navbar_edit_announcement.tsx b/src/module/announcement/component/ui/navbar_edit_announcement.tsx
deleted file mode 100644
index 3add416..0000000
--- a/src/module/announcement/component/ui/navbar_edit_announcement.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client'
-import { LayoutIconBack, LayoutNavbarHome } from "@/module/_global";
-import { Box, Grid, Text } from "@mantine/core";
-
-export default function NavbarEditAnnouncement() {
-   return (
-      <Box>
-         <LayoutNavbarHome>
-            <Grid justify='center' align='center'>
-               <Grid.Col span="auto">
-                  <LayoutIconBack />
-               </Grid.Col>
-               <Grid.Col span={6}>
-                  <Text ta={'center'} fw={'bold'} c={'white'}>Edit Pengumuman</Text>
-               </Grid.Col>
-               <Grid.Col span="auto"></Grid.Col>
-            </Grid>
-         </LayoutNavbarHome>
-      </Box>
-   )
-}
\ No newline at end of file
diff --git a/src/module/announcement/view/view_create_announcement.tsx b/src/module/announcement/view/view_create_announcement.tsx
index 7b62cda..3c4e803 100644
--- a/src/module/announcement/view/view_create_announcement.tsx
+++ b/src/module/announcement/view/view_create_announcement.tsx
@@ -1,14 +1,12 @@
 import { LayoutNavbarNew, WARNA } from "@/module/_global";
-import { Box, Stack, TextInput, Button, Textarea } from "@mantine/core";
-import { HiOutlineChevronRight, HiUser } from "react-icons/hi2";
+import { Box } from "@mantine/core";
 import CreateAnnouncement from "../component/create_announcement";
 
 export default function ViewCreateAnnouncement() {
    return (
       <Box>
-         {/* <NavbarCreateAnnouncement /> */}
          <LayoutNavbarNew back="" title="Tambah Pengumuman" menu={<></>} />
-         <CreateAnnouncement/>
+         <CreateAnnouncement />
       </Box>
    )
 }
\ No newline at end of file
diff --git a/src/module/announcement/view/view_edit_announcement.tsx b/src/module/announcement/view/view_edit_announcement.tsx
index 22114c3..39e0c16 100644
--- a/src/module/announcement/view/view_edit_announcement.tsx
+++ b/src/module/announcement/view/view_edit_announcement.tsx
@@ -1,12 +1,10 @@
-import { Box, Button, Stack, Textarea, TextInput } from "@mantine/core";
-import { LayoutNavbarNew, WARNA } from "@/module/_global";
-import { HiOutlineChevronRight } from "react-icons/hi2";
+import { Box } from "@mantine/core";
+import { LayoutNavbarNew } from "@/module/_global";
 import EditAnnouncement from "../component/edit_announcement";
 
 export default function ViewEditAnnouncement({ data }: { data: string }) {
    return (
       <Box>
-         {/* <NavbarEditAnnouncement /> */}
          <LayoutNavbarNew back="" title="Edit Pengumuman" menu={<></>} />
          <EditAnnouncement />
       </Box>
diff --git a/src/module/home/view/view_detail_feature.tsx b/src/module/home/view/view_detail_feature.tsx
index 71e4880..bddfed1 100644
--- a/src/module/home/view/view_detail_feature.tsx
+++ b/src/module/home/view/view_detail_feature.tsx
@@ -1,28 +1,17 @@
 'use client'
-import { LayoutNavbarHome, WARNA } from '@/module/_global';
-import { ActionIcon, Box, Center, Grid, Group, SimpleGrid, Text } from '@mantine/core';
+import { LayoutNavbarNew, WARNA } from '@/module/_global';
+import { ActionIcon, Box, Center, SimpleGrid, Text } from '@mantine/core';
 import React from 'react';
 import { HiMiniUserGroup, HiMiniPresentationChartBar, HiMegaphone, HiSquares2X2, HiChevronLeft, HiUserGroup, HiUsers } from "react-icons/hi2";
 import { PiUsersFourFill } from "react-icons/pi";
-import { FaUsersRays, FaUserTie } from "react-icons/fa6";
 import { useRouter } from 'next/navigation';
-import LayoutIconBack from '@/module/_global/layout/layout_icon_back';
+import { FaUserTie } from 'react-icons/fa6';
 
 export default function ViewDetailFeature() {
   const router = useRouter()
   return (
     <>
-      <LayoutNavbarHome>
-        <Grid justify='center' align='center'>
-          <Grid.Col span="auto">
-            <LayoutIconBack back='/home' />
-          </Grid.Col>
-          <Grid.Col span={6}>
-            <Text ta={'center'} fw={'bold'} c={'white'} >SEMUA FITUR</Text>
-          </Grid.Col>
-          <Grid.Col span="auto"></Grid.Col>
-        </Grid>
-      </LayoutNavbarHome>
+      <LayoutNavbarNew back='/home' title='Fitur' menu={<></>} />
       <Box p={20}>
         <Box >
           <SimpleGrid