diff --git a/src/main/java/andromeda/hebat/finalisjtiadmin/controllers/pages/admin/jurusan/KelolaDataMahasiswaController.java b/src/main/java/andromeda/hebat/finalisjtiadmin/controllers/pages/admin/jurusan/KelolaDataMahasiswaController.java
index a192de2..8a944ca 100644
--- a/src/main/java/andromeda/hebat/finalisjtiadmin/controllers/pages/admin/jurusan/KelolaDataMahasiswaController.java
+++ b/src/main/java/andromeda/hebat/finalisjtiadmin/controllers/pages/admin/jurusan/KelolaDataMahasiswaController.java
@@ -35,8 +35,8 @@ public class KelolaDataMahasiswaController {
     @FXML
     private TableColumn<Mahasiswa, String> columnNama;
 
-    @FXML
-    private TableColumn<Mahasiswa, String> columnPassword;
+//    @FXML
+//    private TableColumn<Mahasiswa, String> columnPassword;
 
     @FXML
     private TableColumn<Mahasiswa, String> columnEmail;
@@ -65,7 +65,7 @@ public void initialize() {
         });
         columnNim.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getNim()));
         columnNama.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getNama()));
-        columnPassword.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getPassword()));
+        //columnPassword.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getPassword()));
         columnEmail.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getEmail()));
         columnJurusan.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getJurusan()));
         columnProdi.setCellValueFactory(cellData -> new SimpleStringProperty(cellData.getValue().getProdi()));
@@ -163,6 +163,10 @@ public void openOverlayHapusMahasiswa(Mahasiswa mahasiswa){
 
             FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/views/pages/admin/jurusan/overlay/overlay-hapus-data-mahasiswa.fxml"));
             Scene scene = new Scene(fxmlLoader.load(), 400, 450);
+
+            OverlayDeleteDataMahasiswa overlayController = fxmlLoader.getController();
+            overlayController.fillData(mahasiswa);
+
             overlay.setScene(scene);
             overlay.show();
         } catch (Exception e) {
diff --git a/src/main/resources/views/pages/admin/jurusan/kelola-data-mahasiswa.fxml b/src/main/resources/views/pages/admin/jurusan/kelola-data-mahasiswa.fxml
index 2b758d2..7680990 100644
--- a/src/main/resources/views/pages/admin/jurusan/kelola-data-mahasiswa.fxml
+++ b/src/main/resources/views/pages/admin/jurusan/kelola-data-mahasiswa.fxml
@@ -41,7 +41,7 @@
                             <TableColumn fx:id="columnNo" prefWidth="75.0" text="No" />
                             <TableColumn fx:id="columnNim" prefWidth="150.0" text="Nim" />
                             <TableColumn fx:id="columnNama" prefWidth="75.0" text="Nama Lengkap" />
-                            <TableColumn fx:id="columnPassword" prefWidth="150.0" text="Password" />
+<!--                            <TableColumn fx:id="columnPassword" prefWidth="150.0" text="Password" />-->
                             <TableColumn fx:id="columnEmail" prefWidth="100.0" text="Email" />
                      <TableColumn fx:id="columnJurusan" prefWidth="100.0" text="Jurusan" />
                      <TableColumn fx:id="columnProdi" prefWidth="100.0" text="Prodi" />
diff --git a/src/main/resources/views/pages/admin/jurusan/notifikasi-admin-jurusan.fxml b/src/main/resources/views/pages/admin/jurusan/notifikasi-admin-jurusan.fxml
new file mode 100644
index 0000000..16ae109
--- /dev/null
+++ b/src/main/resources/views/pages/admin/jurusan/notifikasi-admin-jurusan.fxml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.effect.DropShadow?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.paint.Color?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<HBox fx:id="notifikasiJurusan" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="700.0" minWidth="-Infinity" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
+    <fx:include source="../../../components/admin/jurusan/sidebar.fxml" />
+    <VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="700.0" style="-fx-background-color: FFFFFF;" HBox.hgrow="ALWAYS">
+        <children>
+            <fx:include source="../../../components/admin/topbar.fxml" />
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="81.0" prefWidth="661.0">
+                <children>
+                    <Label prefHeight="67.0" prefWidth="295.0" text="Notifikasi" textFill="#052c65">
+                        <font>
+                            <Font name="Reddit Sans Black" size="36.0" />
+                        </font>
+                    </Label>
+                </children>
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" top="20.0" />
+                </VBox.margin>
+            </VBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0" style="-fx-background-radius: 6; -fx-background-color: FFFFFF;">
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" />
+                </VBox.margin>
+                <effect>
+                    <DropShadow offsetY="7.0">
+                        <color>
+                            <Color opacity="0.22335022687911987" />
+                        </color>
+                    </DropShadow>
+                </effect>
+            <children>
+               <HBox prefHeight="100.0" prefWidth="200.0">
+                  <children>
+                     <VBox prefHeight="200.0" prefWidth="100.0">
+                        <children>
+                           <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Vladimir Putin / 2341720000">
+                              <font>
+                                 <Font name="System Bold" size="20.0" />
+                              </font>
+                              <VBox.margin>
+                                 <Insets left="10.0" top="15.0" />
+                              </VBox.margin>
+                           </Text>
+                           <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Submit form administrasi prodi">
+                              <font>
+                                 <Font size="20.0" />
+                              </font>
+                              <VBox.margin>
+                                 <Insets left="10.0" top="10.0" />
+                              </VBox.margin>
+                           </Text>
+                        </children>
+                        <HBox.margin>
+                           <Insets right="100.0" />
+                        </HBox.margin>
+                     </VBox>
+                  </children>
+               </HBox>
+               <HBox prefHeight="100.0" prefWidth="200.0">
+                  <children>
+                     <Text strokeType="OUTSIDE" strokeWidth="0.0" text="12:00 PM" textAlignment="RIGHT">
+                        <font>
+                           <Font size="20.0" />
+                        </font>
+                        <HBox.margin>
+                           <Insets bottom="45.0" left="125.0" top="10.0" />
+                        </HBox.margin>
+                     </Text>
+                  </children>
+               </HBox>
+            </children>
+            </HBox>
+         <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0" style="-fx-background-radius: 6; -fx-background-color: FFFFFF;">
+            <effect>
+               <DropShadow offsetY="7.0">
+                  <color>
+                     <Color opacity="0.22335022687911987" />
+                  </color>
+               </DropShadow>
+            </effect>
+            <children>
+               <HBox prefHeight="100.0" prefWidth="200.0">
+                  <children>
+                     <VBox prefHeight="200.0" prefWidth="100.0">
+                        <children>
+                           <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Anggi/Verifikator TA">
+                              <font>
+                                 <Font name="System Bold" size="20.0" />
+                              </font>
+                              <VBox.margin>
+                                 <Insets left="10.0" top="15.0" />
+                              </VBox.margin>
+                           </Text>
+                           <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Melakukan verifikasi...">
+                              <font>
+                                 <Font size="20.0" />
+                              </font>
+                              <VBox.margin>
+                                 <Insets left="10.0" top="10.0" />
+                              </VBox.margin>
+                           </Text>
+                        </children>
+                        <HBox.margin>
+                           <Insets right="100.0" />
+                        </HBox.margin>
+                     </VBox>
+                  </children>
+                  <HBox.margin>
+                     <Insets right="75.0" />
+                  </HBox.margin>
+               </HBox>
+               <HBox prefHeight="100.0" prefWidth="200.0">
+                  <children>
+                     <Text strokeType="OUTSIDE" strokeWidth="0.0" text="08:00 PM" textAlignment="RIGHT">
+                        <font>
+                           <Font size="20.0" />
+                        </font>
+                        <HBox.margin>
+                           <Insets bottom="45.0" left="125.0" top="10.0" />
+                        </HBox.margin>
+                     </Text>
+                  </children>
+               </HBox>
+            </children>
+            <VBox.margin>
+               <Insets left="20.0" right="20.0" top="20.0" />
+            </VBox.margin>
+         </HBox>
+        </children>
+    </VBox>
+</HBox>
diff --git a/src/main/resources/views/pages/admin/prodi/notifikasi-admin-prodi.fxml b/src/main/resources/views/pages/admin/prodi/notifikasi-admin-prodi.fxml
new file mode 100644
index 0000000..6af18a6
--- /dev/null
+++ b/src/main/resources/views/pages/admin/prodi/notifikasi-admin-prodi.fxml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.effect.DropShadow?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.paint.Color?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<HBox fx:id="notifikasiProdi" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="700.0" minWidth="-Infinity" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
+    <fx:include source="../../../components/admin/prodi/sidebar.fxml" />
+    <VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="700.0" style="-fx-background-color: FFFFFF;" HBox.hgrow="ALWAYS">
+        <children>
+            <fx:include source="../../../components/admin/topbar.fxml" />
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="81.0" prefWidth="661.0">
+                <children>
+                    <Label prefHeight="67.0" prefWidth="295.0" text="Notifikasi" textFill="#052c65">
+                        <font>
+                            <Font name="Reddit Sans Black" size="36.0" />
+                        </font>
+                    </Label>
+                </children>
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" top="20.0" />
+                </VBox.margin>
+            </VBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0" style="-fx-background-radius: 6; -fx-background-color: FFFFFF;">
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" />
+                </VBox.margin>
+                <effect>
+                    <DropShadow offsetY="7.0">
+                        <color>
+                            <Color opacity="0.22335022687911987" />
+                        </color>
+                    </DropShadow>
+                </effect>
+                <children>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <VBox prefHeight="200.0" prefWidth="100.0">
+                                <children>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Vladimir Putin / 2341720000">
+                                        <font>
+                                            <Font name="System Bold" size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="15.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Submit form administrasi prodi">
+                                        <font>
+                                            <Font size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="10.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                </children>
+                                <HBox.margin>
+                                    <Insets right="100.0" />
+                                </HBox.margin>
+                            </VBox>
+                        </children>
+                  <HBox.margin>
+                     <Insets left="25.0" right="75.0" />
+                  </HBox.margin>
+                    </HBox>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="12:00 PM" textAlignment="RIGHT">
+                                <font>
+                                    <Font size="20.0" />
+                                </font>
+                                <HBox.margin>
+                                    <Insets bottom="45.0" left="110.0" top="10.0" />
+                                </HBox.margin>
+                            </Text>
+                        </children>
+                    </HBox>
+                </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0" style="-fx-background-radius: 6; -fx-background-color: FFFFFF;">
+                <effect>
+                    <DropShadow offsetY="7.0">
+                        <color>
+                            <Color opacity="0.22335022687911987" />
+                        </color>
+                    </DropShadow>
+                </effect>
+                <children>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <VBox prefHeight="200.0" prefWidth="100.0">
+                                <children>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Melati / 2341720009">
+                                        <font>
+                                            <Font name="System Bold" size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="15.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Submit form administrasi prodi">
+                                        <font>
+                                            <Font size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="10.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                </children>
+                                <HBox.margin>
+                                    <Insets right="90.0" />
+                                </HBox.margin>
+                            </VBox>
+                        </children>
+                        <HBox.margin>
+                            <Insets left="20.0" right="75.0" />
+                        </HBox.margin>
+                    </HBox>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="08:00 PM" textAlignment="RIGHT">
+                                <font>
+                                    <Font size="20.0" />
+                                </font>
+                                <HBox.margin>
+                                    <Insets bottom="45.0" left="125.0" right="10.0" top="10.0" />
+                                </HBox.margin>
+                            </Text>
+                        </children>
+                    </HBox>
+                </children>
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" top="20.0" />
+                </VBox.margin>
+            </HBox>
+        </children>
+    </VBox>
+</HBox>
diff --git a/src/main/resources/views/pages/admin/ta/notifikasi-admin-ta.fxml b/src/main/resources/views/pages/admin/ta/notifikasi-admin-ta.fxml
new file mode 100644
index 0000000..5508027
--- /dev/null
+++ b/src/main/resources/views/pages/admin/ta/notifikasi-admin-ta.fxml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.effect.DropShadow?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.paint.Color?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<HBox fx:id="notifikasiTA" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="700.0" minWidth="-Infinity" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
+    <fx:include source="../../../components/admin/ta/sidebar.fxml" />
+    <VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="700.0" style="-fx-background-color: FFFFFF;" HBox.hgrow="ALWAYS">
+        <children>
+            <fx:include source="../../../components/admin/topbar.fxml" />
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="81.0" prefWidth="661.0">
+                <children>
+                    <Label prefHeight="67.0" prefWidth="295.0" text="Notifikasi" textFill="#052c65">
+                        <font>
+                            <Font name="Reddit Sans Black" size="36.0" />
+                        </font>
+                    </Label>
+                </children>
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" top="20.0" />
+                </VBox.margin>
+            </VBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0" style="-fx-background-radius: 6; -fx-background-color: FFFFFF;">
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" />
+                </VBox.margin>
+                <effect>
+                    <DropShadow offsetY="7.0">
+                        <color>
+                            <Color opacity="0.22335022687911987" />
+                        </color>
+                    </DropShadow>
+                </effect>
+                <children>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <VBox prefHeight="200.0" prefWidth="100.0">
+                                <children>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Vladimir Putin / 2341720000">
+                                        <font>
+                                            <Font name="System Bold" size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="15.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Submit form administrasi tugas akhir">
+                                        <font>
+                                            <Font size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="10.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                </children>
+                                <HBox.margin>
+                                    <Insets right="100.0" />
+                                </HBox.margin>
+                        <padding>
+                           <Insets left="10.0" />
+                        </padding>
+                            </VBox>
+                        </children>
+                    </HBox>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="12:00 PM" textAlignment="RIGHT">
+                                <font>
+                                    <Font size="20.0" />
+                                </font>
+                                <HBox.margin>
+                                    <Insets bottom="45.0" left="125.0" right="10.0" top="10.0" />
+                                </HBox.margin>
+                            </Text>
+                        </children>
+                    </HBox>
+                </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="40.0" style="-fx-background-radius: 6; -fx-background-color: FFFFFF;">
+                <effect>
+                    <DropShadow offsetY="7.0">
+                        <color>
+                            <Color opacity="0.22335022687911987" />
+                        </color>
+                    </DropShadow>
+                </effect>
+                <children>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <VBox prefHeight="200.0" prefWidth="100.0">
+                                <children>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Melati / 2341720009">
+                                        <font>
+                                            <Font name="System Bold" size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="15.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                    <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Submit form administrasi tugas akhir">
+                                        <font>
+                                            <Font size="20.0" />
+                                        </font>
+                                        <VBox.margin>
+                                            <Insets left="10.0" top="10.0" />
+                                        </VBox.margin>
+                                    </Text>
+                                </children>
+                                <HBox.margin>
+                                    <Insets right="100.0" />
+                                </HBox.margin>
+                            </VBox>
+                        </children>
+                        <HBox.margin>
+                            <Insets />
+                        </HBox.margin>
+                    </HBox>
+                    <HBox prefHeight="100.0" prefWidth="200.0">
+                        <children>
+                            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="08:00 PM" textAlignment="RIGHT">
+                                <font>
+                                    <Font size="20.0" />
+                                </font>
+                                <HBox.margin>
+                                    <Insets bottom="45.0" left="125.0" top="10.0" />
+                                </HBox.margin>
+                            </Text>
+                        </children>
+                    </HBox>
+                </children>
+                <VBox.margin>
+                    <Insets left="20.0" right="20.0" top="20.0" />
+                </VBox.margin>
+            </HBox>
+        </children>
+    </VBox>
+</HBox>