diff --git a/app/(application)/discussion/[id].tsx b/app/(application)/discussion/[id].tsx
index b791cc0..ebe2caa 100644
--- a/app/(application)/discussion/[id].tsx
+++ b/app/(application)/discussion/[id].tsx
@@ -23,121 +23,119 @@ export default function DetailDiscussionGeneral() {
             }}
          />
          <View style={{ flex: 1 }}>
-            <View style={{ flex: 5 }}>
-               <ScrollView>
-                  <View style={[Styles.p15, Styles.mb100]}>
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <BorderBottomItem
+                     borderType="bottom"
+                     icon={
+                        <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                           <MaterialIcons name="chat" size={25} color={'#384288'} />
+                        </View>
+                     }
+                     title="Danantara"
+                     subtitle={
+                        <LabelStatus category='success' text='BUKA' size="small" />
+                     }
+                     rightTopInfo="3 Jan 2025"
+                     desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
+                     leftBottomInfo={
+                        <View style={[Styles.rowItemsCenter]}>
+                           <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
+                           <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>15 Komentar</Text>
+                        </View>
+                     }
+                  />
+                  <View style={[Styles.p15]}>
                      <BorderBottomItem
                         borderType="bottom"
                         icon={
-                           <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                              <MaterialIcons name="chat" size={25} color={'#384288'} />
-                           </View>
-                        }
-                        title="Danantara"
-                        subtitle={
-                           <LabelStatus category='success' text='BUKA' size="small" />
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
                         }
+                        title="Amalia Dwi"
                         rightTopInfo="3 Jan 2025"
-                        desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
-                        leftBottomInfo={
-                           <View style={[Styles.rowItemsCenter]}>
-                              <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                              <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>15 Komentar</Text>
-                           </View>
-                        }
+                        desc="sangat berdampak dari berbagai sisi"
+                     />
+                     <BorderBottomItem
+                        borderType="bottom"
+                        icon={
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
+                        }
+                        title="Amalia Dwi"
+                        rightTopInfo="3 Jan 2025"
+                        desc="semua menjadi terbatas.."
+                     />
+                     <BorderBottomItem
+                        borderType="bottom"
+                        icon={
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
+                        }
+                        title="Amalia Dwi"
+                        rightTopInfo="3 Jan 2025"
+                        desc="semua menjadi terbatas.."
+                     />
+                     <BorderBottomItem
+                        borderType="bottom"
+                        icon={
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
+                        }
+                        title="Amalia Dwi"
+                        rightTopInfo="3 Jan 2025"
+                        desc="semua menjadi terbatas.."
+                     />
+                     <BorderBottomItem
+                        borderType="bottom"
+                        icon={
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
+                        }
+                        title="Amalia Dwi"
+                        rightTopInfo="3 Jan 2025"
+                        desc="semua menjadi terbatas.."
+                     />
+                     <BorderBottomItem
+                        borderType="bottom"
+                        icon={
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
+                        }
+                        title="Amalia Dwi"
+                        rightTopInfo="3 Jan 2025"
+                        desc="semua menjadi terbatas.."
                      />
-                     <View style={[Styles.p15]}>
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="sangat berdampak dari berbagai sisi"
-                        />
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="semua menjadi terbatas.."
-                        />
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="semua menjadi terbatas.."
-                        />
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="semua menjadi terbatas.."
-                        />
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="semua menjadi terbatas.."
-                        />
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="semua menjadi terbatas.."
-                        />
 
-                        <BorderBottomItem
-                           borderType="bottom"
-                           icon={
-                              <Image
-                                 source={require("../../../assets/images/user.jpeg")}
-                                 style={[Styles.userProfileExtraSmall]}
-                              />
-                           }
-                           title="Amalia Dwi"
-                           rightTopInfo="3 Jan 2025"
-                           desc="semua menjadi terbatas.."
-                        />
+                     <BorderBottomItem
+                        borderType="bottom"
+                        icon={
+                           <Image
+                              source={require("../../../assets/images/user.jpeg")}
+                              style={[Styles.userProfileExtraSmall]}
+                           />
+                        }
+                        title="Amalia Dwi"
+                        rightTopInfo="3 Jan 2025"
+                        desc="semua menjadi terbatas.."
+                     />
 
-                     </View>
                   </View>
-               </ScrollView>
-            </View>
-            <View style={[Styles.p15, { flex: 1 }]}>
+               </View>
+            </ScrollView>
+            <View style={[Styles.ph15, Styles.pv10, { position: 'absolute', bottom: 10 }]}>
                <InputForm
                   type="default"
                   round
diff --git a/app/(application)/discussion/create.tsx b/app/(application)/discussion/create.tsx
index 71b5235..f514da0 100644
--- a/app/(application)/discussion/create.tsx
+++ b/app/(application)/discussion/create.tsx
@@ -1,6 +1,7 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import { ButtonForm } from "@/components/buttonForm";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import SelectForm from "@/components/selectForm";
@@ -19,6 +20,10 @@ export default function CreateDiscussionGeneral() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Diskusi',
                headerTitleAlign: 'center',
+               headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
+                  ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+                  router.push('/discussion?active=true')
+               }} />
             }}
          />
          <ScrollView>
@@ -26,8 +31,8 @@ export default function CreateDiscussionGeneral() {
                <SelectForm label="Lembaga Desa" placeholder="Pilih Lembaga Desa" value={chooseGroup.label} required onPress={() => { }} />
                <InputForm label="Nama" type="default" placeholder="Nama" required />
                <InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required />
-               <ButtonSelect value="Pilih Anggota"/>
-               <ButtonForm
+               <ButtonSelect value="Pilih Anggota" />
+               {/* <ButtonForm
                   text="SIMPAN"
                   onPress={() => {
                      AlertKonfirmasi({
@@ -38,7 +43,7 @@ export default function CreateDiscussionGeneral() {
                            router.push('/discussion?active=true')
                         }
                      })
-                  }} />
+                  }} /> */}
             </View>
          </ScrollView>
       </SafeAreaView>
diff --git a/app/(application)/discussion/edit/[id].tsx b/app/(application)/discussion/edit/[id].tsx
index 141897e..5621a43 100644
--- a/app/(application)/discussion/edit/[id].tsx
+++ b/app/(application)/discussion/edit/[id].tsx
@@ -1,6 +1,5 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import ButtonBackHeader from "@/components/buttonBackHeader"
-import { ButtonForm } from "@/components/buttonForm"
+import ButtonSaveHeader from "@/components/buttonSaveHeader"
 import { InputForm } from "@/components/inputForm"
 import Styles from "@/constants/Styles"
 import { router, Stack } from "expo-router"
@@ -14,13 +13,17 @@ export default function EditDiscussionGeneral() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Edit Diskusi',
                headerTitleAlign: 'center',
+               headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
+                  ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
+                  router.back()
+               }} />
             }}
          />
          <ScrollView>
             <View style={[Styles.p15]}>
                <InputForm label="Judul" type="default" placeholder="Judul" required />
                <InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required />
-               <ButtonForm
+               {/* <ButtonForm
                   text="SIMPAN"
                   onPress={() => {
                      AlertKonfirmasi({
@@ -31,7 +34,7 @@ export default function EditDiscussionGeneral() {
                            router.back()
                         }
                      })
-                  }} />
+                  }} /> */}
             </View>
          </ScrollView>
       </SafeAreaView>