diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index c6309f3..e69de29 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -1,292 +0,0 @@
-@extends('layouts.app-admin')
-<title>Dashboard Admin | SR Klasifikasi</title>
-@section('content')
-<main id="main" class="main">
-    <div class="row">
-        <div class="pagetitle">
-            <h1>Halo <b>{{ ucwords($user->role) }}</b> 👋</h1>
-            <nav>
-                <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="#">Admin</a></li>
-                    <li class="breadcrumb-item active">Dashboard</li>
-                </ol>
-            </nav>
-        </div><!-- End Page Title -->
-
-
-        <div class="col-12 dashboard">
-            <div class="row">
-                @if(session('success'))
-                <div class="alert alert-success">
-                    {{ session('success') }}
-                </div>
-                @endif
-                <div class="col-12">
-                    <div class="row">
-                        <div class="col-xxl-6 col-md-6">
-                            <div class="card info-card sales-card">
-                                <div class="card-body">
-                                    <h5 class="card-title">Santri <span>| Jumlah</span></h5>
-                                    <div class="d-flex align-items-center">
-                                        <div
-                                            class="card-icon rounded-circle d-flex align-items-center justify-content-center">
-                                            <i class='bx bx-universal-access'></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6>400</h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-xxl-6 col-md-6 mb-3">
-                            <div class="card info-card revenue-card">
-                                <div class="card-body">
-                                    <h5 class="card-title">Tepat Waktu <span>| Jumlah</span></h5>
-                                    <div class="d-flex align-items-center">
-                                        <div
-                                            class="card-icon rounded-circle d-flex align-items-center justify-content-center">
-                                            <i class='bx bx-child'></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6>400</h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-12">
-                            <div class="card">
-                                <div class="card-body pb-0">
-                                    <h5 class="card-title">Klasifikasi</h5>
-
-                                    <div id="trafficChart" style="min-height: 400px;" class="echart"></div>
-
-                                    <script>
-                                        document.addEventListener("DOMContentLoaded", () => {
-                                              echarts.init(document.querySelector("#trafficChart")).setOption({
-                                                tooltip: {
-                                                  trigger: 'item'
-                                                },
-                                                legend: {
-                                                  top: '5%',
-                                                  left: 'center'
-                                                },
-                                                series: [{
-                                                  name: 'Access From',
-                                                  type: 'pie',
-                                                  radius: ['40%', '70%'],
-                                                  avoidLabelOverlap: false,
-                                                  label: {
-                                                    show: false,
-                                                    position: 'center'
-                                                  },
-                                                  emphasis: {
-                                                    label: {
-                                                      show: true,
-                                                      fontSize: '18',
-                                                      fontWeight: 'bold'
-                                                    }
-                                                  },
-                                                  labelLine: {
-                                                    show: false
-                                                  },
-                                                  data: [{
-                                                      value: 1048,
-                                                      name: 'Tepat Waktu'
-                                                    },
-                                                    {
-                                                      value: 735,
-                                                      name: 'Terlambat'
-                                                    },
-                                                  ]
-                                                }]
-                                              });
-                                            });
-                                    </script>
-
-                                </div>
-                            </div><!-- End Website Traffic -->
-                        </div>
-
-                        <div class="col-xxl-6 col-md-6 mb-3">
-                            <div class="card">
-                                <div class="card-body">
-                                    <h5 class="card-title justify-content-center d-flex">Jenis Kelamin</h5>
-                                    <div id="jenisKelamin"></div>
-                                </div>
-                            </div>
-                            <script>
-                                document.addEventListener("DOMContentLoaded", () => {
-                                                          new ApexCharts(document.querySelector("#jenisKelamin"), {
-                                                            series: [{
-                                                              name: 'Laki Laki',
-                                                              data: [21,22,23,24,25],
-                                                            }, {
-                                                              name: 'Perempuan',
-                                                              data: [11, 32, 45,32, 41]
-                                                            }],
-                                                            chart: {
-                                                              height: 350,
-                                                              type: 'area',
-                                                              toolbar: {
-                                                                show: false
-                                                              },
-                                                            },
-                                                            markers: {
-                                                              size: 4
-                                                            },
-                                                            colors: ['#4154f1', '#2eca6a'],
-                                                            fill: {
-                                                              type: "gradient",
-                                                              gradient: {
-                                                                shadeIntensity: 1,
-                                                                opacityFrom: 0.3,
-                                                                opacityTo: 0.4,
-                                                                stops: [0, 90, 100]
-                                                              }
-                                                            },
-                                                            dataLabels: {
-                                                              enabled: false
-                                                            },
-                                                            stroke: {
-                                                              curve: 'smooth',
-                                                              width: 2
-                                                            },
-                                                            xaxis: {
-                                                              type: 'year',
-                                                              categories: ["2021","2022", "2023", "2024", "2025"
-                                                              ]
-                                                            },
-                                                            tooltip: {
-                                                              x: {
-                                                                format: 'dd/MM/yy HH:mm'
-                                                              },
-                                                            }
-                                                          }).render();
-                                                        });
-                            </script>
-                            <!-- End Line Chart -->
-
-                        </div>
-                        <div class="col-xxl-6 col-md-6">
-                            <div class="card">
-                                <div class="card-body">
-                                    <h5 class="card-title justify-content-center d-flex">Asal Daerah</h5>
-                                    <div id="asalDaerah"></div>
-                                </div>
-                            </div>
-                            <script>
-                                document.addEventListener("DOMContentLoaded", () => 
-                                        {
-                                            new ApexCharts(document.querySelector("#asalDaerah"), {
-                                            series: [{
-                                                name: 'Dalam Provinsi',
-                                                data: [21,22,23,24,25],
-                                            }, {
-                                                name: 'Luar Provinsi',
-                                                data: [11, 32, 45,32, 41]
-                                            }],
-                                            chart: {
-                                                height: 350,
-                                                type: 'area',
-                                                toolbar: {
-                                                show: false
-                                                },
-                                            },
-                                            markers: {
-                                                size: 4
-                                            },
-                                            colors: ['#F14141FF', '#C72ECAFF'],
-                                            fill: {
-                                                type: "gradient",
-                                                gradient: {
-                                                shadeIntensity: 1,
-                                                opacityFrom: 0.3,
-                                                opacityTo: 0.4,
-                                                stops: [0, 90, 100]
-                                                }
-                                            },
-                                            dataLabels: {
-                                                enabled: false
-                                            },
-                                            stroke: {
-                                                curve: 'smooth',
-                                                width: 2
-                                            },
-                                            xaxis: {
-                                                type: 'year',
-                                                categories: ["2021","2022", "2023", "2024", "2025"
-                                                ]
-                                            },
-                                            tooltip: {
-                                                x: {
-                                                format: 'dd/MM/yy HH:mm'
-                                                },
-                                            }
-                                            }).render();
-                                        });
-                            </script>
-
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xxl-12 col-md-12">
-                    <div class="row">
-                        <!-- Card Tanggal -->
-                        <div class="col-md-6">
-                            <div class="card info-card date-card shadow-lg"
-                                style="background-color: #f8f9fa; border-left: 5px solid #007bff;">
-                                <div class="card-body text-center">
-                                    <h5 class="card-title text-primary fw-bold">Tanggal Hari Ini</h5>
-                                    <div class="d-flex align-items-center justify-content-center">
-                                        <div
-                                            class="card-icon rounded-circle bg-primary text-white d-flex align-items-center justify-content-center p-3">
-                                            <i class='bx bx-calendar text-white' style="font-size: 1.5rem;"></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6 id="current-date" class="fw-semibold " style="color: #012970">Loading...
-                                            </h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <!-- Card Waktu -->
-                        <div class="col-md-6">
-                            <div class="card info-card time-card shadow-lg"
-                                style="background-color: #f8f9fa; border-left: 5px solid #28a745;">
-                                <div class="card-body text-center">
-                                    <h5 class="card-title text-success fw-bold">Waktu Saat Ini</h5>
-                                    <div class="d-flex align-items-center justify-content-center">
-                                        <div
-                                            class="card-icon rounded-circle bg-success text-white d-flex align-items-center justify-content-center p-3">
-                                            <i class='bx bx-time text-white' style="font-size: 1.5rem;"></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6 id="current-time" class="fw-semibold " style="color: #012970">Loading...
-                                            </h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</main>
-
-<script>
-    function updateTime() {
-        const now = new Date();
-        document.getElementById('current-date').innerText = now.toLocaleDateString('id-ID', { weekday: 'long', day: 'numeric', month: 'long', year: 'numeric' });
-        document.getElementById('current-time').innerText = now.toLocaleTimeString('id-ID', { hour: '2-digit', minute: '2-digit', second: '2-digit' });
-    }
-    setInterval(updateTime, 1000);
-    updateTime();
-</script>
-@endsection
\ No newline at end of file
diff --git a/resources/views/pages/admin/class-result.blade.php b/resources/views/pages/admin/class-result.blade.php
index 83bcda7..78b88ff 100644
--- a/resources/views/pages/admin/class-result.blade.php
+++ b/resources/views/pages/admin/class-result.blade.php
@@ -19,10 +19,40 @@
         <div class="col-12">
             <div class="card">
                 <div class="card-body">
-                    <h5 class="card-title">Hasil Klasifikasi</h5>
+                    <div class="col-12 d-flex flex-wrap justify-content-between align-items-center my-3 gap-2">
+                        <h5 class="card-title mb-0">Hasil Klasifikasi</h5>
+
+                        <!-- Tombol Export -->
+                        <div class="d-flex flex-wrap gap-2">
+                            <button id="btnExcel" class="btn btn-success">
+                                <i class='bx bx-file'></i> Export Excel
+                            </button>
+                            <button id="btnCSV" class="btn btn-info text-white">
+                                <i class='bx bx-data'></i> Export CSV
+                            </button>
+                            <button id="btnPDF" class="btn btn-danger">
+                                <i class='bx bxs-file-pdf'></i> Export PDF
+                            </button>
+                        </div>
+                    </div>
+
+                    <!-- Filter Dropdown -->
+                    <div class="mb-3">
+                        <select id="filterColumn" class="form-select w-auto d-inline-block">
+                            <option value="">Pilih Kolom</option>
+                            <option value="0">Nama</option>
+                            <option value="1">Jenis Kelamin</option>
+                            <option value="3">Asal Daerah</option>
+                            <option value="4">Tahun Angkatan</option>
+                            <option value="8">Status Prediksi</option>
+                        </select>
+                        <input type="text" id="filterInput" class="form-control w-auto d-inline-block ms-2"
+                            placeholder="Cari...">
+                    </div>
+
                     <div class="table-responsive">
                         <table id="dataTable" class="table table-striped table-bordered">
-                            <thead>
+                            <thead class="custom-thead">
                                 <tr>
                                     <th>Nama</th>
                                     <th>Jenis Kelamin</th>
@@ -46,12 +76,19 @@
                                     <td>{{ $item->alhadis }}</td>
                                     <td>{{ $item->alquran }}</td>
                                     <td>{{ $item->status }}</td>
-                                    <td>{{ $item->predicted_status ?? 'Belum Diklasifikasi' }}</td>
+                                    <td>
+                                        @if ($item->predicted_status == 'Tercapai')
+                                        <span class="badge bg-success">Tepat</span>
+                                        @else
+                                        <span class="badge bg-danger">Terlambat</span>
+                                        @endif
+                                    </td>
                                 </tr>
                                 @endforeach
                             </tbody>
                         </table>
                     </div>
+
                 </div>
             </div>
         </div>
@@ -60,25 +97,99 @@
 
 <!-- DataTables & SweetAlert -->
 <link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/jquery.dataTables.min.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.dataTables.min.css">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.19/dist/sweetalert2.min.css">
+
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 <script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.19/dist/sweetalert2.min.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
 
 <script>
     $(document).ready(function () {
-        $('#dataTable').DataTable({
+        var table = $('#dataTable').DataTable({
             responsive: true,
             scrollX: true,
             autoWidth: false,
-            "language": {
-                "search": "Cari:",
-                "lengthMenu": "Tampilkan _MENU_ data",
-                "info": "Menampilkan _START_ sampai _END_ dari _TOTAL_ data",
-                "infoEmpty": "Tidak ada data tersedia",
-                "infoFiltered": "(disaring dari _MAX_ total data)"
+            order: [],
+            dom: 'Bfrtip',
+            buttons: [],
+            language: {
+                search: "Cari:",
+                lengthMenu: "Tampilkan _MENU_ data",
+                info: "Menampilkan _START_ sampai _END_ dari _TOTAL_ data",
+                infoEmpty: "Tidak ada data tersedia",
+                infoFiltered: "(disaring dari _MAX_ total data)"
             }
         });
+
+        // Event untuk tombol export
+        $('#btnExcel').on('click', function () {
+            table.button('.buttons-excel').trigger();
+        });
+
+        $('#btnCSV').on('click', function () {
+            table.button('.buttons-csv').trigger();
+        });
+
+        $('#btnPDF').on('click', function () {
+            table.button('.buttons-pdf').trigger();
+        });
+
+        // Tambahkan tombol export
+        new $.fn.dataTable.Buttons(table, {
+            buttons: [
+                { extend: 'excelHtml5', className: 'buttons-excel', title: 'Data Klasifikasi' },
+                { extend: 'csvHtml5', className: 'buttons-csv', title: 'Data Klasifikasi' },
+                { extend: 'pdfHtml5', className: 'buttons-pdf', title: 'Data Klasifikasi' }
+            ]
+        });
+
+        table.buttons().container().appendTo($('.dataTables_wrapper'));
+
+        // Filter berdasarkan kolom
+        $('#filterInput').on('keyup', function () {
+            let columnIndex = $('#filterColumn').val();
+            if (columnIndex !== '') {
+                table.column(columnIndex).search(this.value).draw();
+            }
+        });
+
+        // Reset filter saat memilih opsi baru
+        $('#filterColumn').on('change', function () {
+            $('#filterInput').val('');
+            table.search('').columns().search('').draw();
+        });
     });
 </script>
+
+<style>
+    .custom-thead {
+        background-color: #012970 !important;
+        color: white;
+    }
+
+    #dataTable tbody tr td {
+        background-color: #f8f9fa !important;
+        color: #012970;
+    }
+
+    .dt-buttons {
+        margin-bottom: 10px;
+    }
+
+    .dt-buttons .btn {
+        margin-right: 5px;
+    }
+
+    .form-select,
+    .form-control {
+        display: inline-block;
+        width: auto;
+    }
+</style>
+
 @endsection
\ No newline at end of file
diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
index c953427..c757015 100644
--- a/resources/views/pages/admin/dashboard.blade.php
+++ b/resources/views/pages/admin/dashboard.blade.php
@@ -25,6 +25,49 @@
         <!-- Statistik Jumlah Santri dan Tepat Waktu -->
         <div class="col-12 dashboard">
             <div class="row">
+                <div class="col-xxl-12 col-md-12">
+                    <div class="row">
+                        <!-- Card Tanggal -->
+                        <div class="col-md-6">
+                            <div class="card info-card date-card shadow-lg"
+                                style="background-color: #f8f9fa; border-left: 5px solid #007bff;">
+                                <div class="card-body text-center">
+                                    <h5 class="card-title text-primary fw-bold">Tanggal Hari Ini</h5>
+                                    <div class="d-flex align-items-center justify-content-center">
+                                        <div
+                                            class="card-icon rounded-circle bg-primary text-white d-flex align-items-center justify-content-center p-3">
+                                            <i class='bx bx-calendar text-white' style="font-size: 1.5rem;"></i>
+                                        </div>
+                                        <div class="ps-3">
+                                            <h6 id="current-date" class="fw-semibold " style="color: #012970">Loading...
+                                            </h6>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Card Waktu -->
+                        <div class="col-md-6">
+                            <div class="card info-card time-card shadow-lg"
+                                style="background-color: #f8f9fa; border-left: 5px solid #28a745;">
+                                <div class="card-body text-center">
+                                    <h5 class="card-title text-success fw-bold">Waktu Saat Ini</h5>
+                                    <div class="d-flex align-items-center justify-content-center">
+                                        <div
+                                            class="card-icon rounded-circle bg-success text-white d-flex align-items-center justify-content-center p-3">
+                                            <i class='bx bx-time text-white' style="font-size: 1.5rem;"></i>
+                                        </div>
+                                        <div class="ps-3">
+                                            <h6 id="current-time" class="fw-semibold " style="color: #012970">Loading...
+                                            </h6>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="col-xxl-6 col-md-6">
                     <div class="card info-card sales-card">
                         <div class="card-body">
@@ -135,50 +178,6 @@
                     </div>
 
                 </div>
-
-                <div class="col-xxl-12 col-md-12">
-                    <div class="row">
-                        <!-- Card Tanggal -->
-                        <div class="col-md-6">
-                            <div class="card info-card date-card shadow-lg"
-                                style="background-color: #f8f9fa; border-left: 5px solid #007bff;">
-                                <div class="card-body text-center">
-                                    <h5 class="card-title text-primary fw-bold">Tanggal Hari Ini</h5>
-                                    <div class="d-flex align-items-center justify-content-center">
-                                        <div
-                                            class="card-icon rounded-circle bg-primary text-white d-flex align-items-center justify-content-center p-3">
-                                            <i class='bx bx-calendar text-white' style="font-size: 1.5rem;"></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6 id="current-date" class="fw-semibold " style="color: #012970">Loading...
-                                            </h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <!-- Card Waktu -->
-                        <div class="col-md-6">
-                            <div class="card info-card time-card shadow-lg"
-                                style="background-color: #f8f9fa; border-left: 5px solid #28a745;">
-                                <div class="card-body text-center">
-                                    <h5 class="card-title text-success fw-bold">Waktu Saat Ini</h5>
-                                    <div class="d-flex align-items-center justify-content-center">
-                                        <div
-                                            class="card-icon rounded-circle bg-success text-white d-flex align-items-center justify-content-center p-3">
-                                            <i class='bx bx-time text-white' style="font-size: 1.5rem;"></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6 id="current-time" class="fw-semibold " style="color: #012970">Loading...
-                                            </h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
diff --git a/resources/views/pages/admin/exam-data.blade.php b/resources/views/pages/admin/exam-data.blade.php
index 00f9c58..9346df8 100644
--- a/resources/views/pages/admin/exam-data.blade.php
+++ b/resources/views/pages/admin/exam-data.blade.php
@@ -332,7 +332,13 @@ class="bx bxs-user-badge me-2"></i> Jenis
                                     <td>{{ $item->alhadis }}</td>
                                     <td>{{ $item->alquran }}</td>
                                     <td>{{ $item->status }}</td>
-                                    <td>{{ $item->predicted_status ?? 'Belum Diklasifikasi' }}</td>
+                                    <td>
+                                        @if ($item->predicted_status == 'Tercapai')
+                                        <span class="badge bg-success">Tepat</span>
+                                        @else
+                                        <span class="badge bg-danger">Terlambat</span>
+                                        @endif
+                                    </td>
                                 </tr>
                                 @endforeach
                             </tbody>
diff --git a/resources/views/pages/auth/register.blade.php b/resources/views/pages/auth/register.blade.php
index 9f969e6..fcf6530 100644
--- a/resources/views/pages/auth/register.blade.php
+++ b/resources/views/pages/auth/register.blade.php
@@ -36,7 +36,7 @@
                         @endif
 
                         <form class="row g-3 needs-validation" action="{{ route('register.post') }}" method="POST"
-                            novalidate>
+                            novalidate id="registerForm">
                             @csrf
                             <div class="col-12">
                                 <label for="nameSantri" class="form-label">Nama</label>
@@ -58,11 +58,28 @@
 
                             <div class="col-12">
                                 <label for="passwordSantri" class="form-label">Password</label>
-                                <input type="password" name="password" class="form-control" id="passwordSantri"
-                                    required>
+                                <div class="input-group">
+                                    <input type="password" name="password" class="form-control" id="passwordSantri"
+                                        required>
+                                    <span class="input-group-text toggle-password" data-target="passwordSantri">
+                                        <i class="bx bx-hide"></i>
+                                    </span>
+                                </div>
                                 <div class="invalid-feedback">Masukkan Password Anda</div>
                             </div>
 
+                            <div class="col-12">
+                                <label for="confirmPasswordSantri" class="form-label">Konfirmasi Password</label>
+                                <div class="input-group">
+                                    <input type="password" name="password_confirmation" class="form-control"
+                                        id="confirmPasswordSantri" required>
+                                    <span class="input-group-text toggle-password" data-target="confirmPasswordSantri">
+                                        <i class="bx bx-hide"></i>
+                                    </span>
+                                </div>
+                                <div class="invalid-feedback">Masukkan Konfirmasi Password Anda</div>
+                            </div>
+
                             <div class="col-12">
                                 <label for="jenisKelamin" class="form-label">Jenis Kelamin</label>
                                 <select class="form-select" name="jenis_kelamin" id="jenisKelamin" required>
@@ -100,4 +117,50 @@
         </div>
     </div>
 </section>
+
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        // Show/Hide Password
+        document.querySelectorAll(".toggle-password").forEach(button => {
+            button.addEventListener("click", function () {
+                let targetId = this.getAttribute("data-target");
+                let input = document.getElementById(targetId);
+                let icon = this.querySelector("i");
+
+                if (input.type === "password") {
+                    input.type = "text";
+                    icon.classList.remove("bx-hide");
+                    icon.classList.add("bx-show");
+                } else {
+                    input.type = "password";
+                    icon.classList.remove("bx-show");
+                    icon.classList.add("bx-hide");
+                }
+            });
+        });
+
+        // Validasi Konfirmasi Password dengan SweetAlert
+        document.getElementById("registerForm").addEventListener("submit", function (event) {
+            let password = document.getElementById("passwordSantri").value;
+            let confirmPassword = document.getElementById("confirmPasswordSantri").value;
+
+            if (password !== confirmPassword) {
+                event.preventDefault();
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Oops...',
+                    text: 'Konfirmasi password tidak cocok!',
+                });
+            }
+        });
+    });
+</script>
+
+<style>
+    .toggle-password {
+        cursor: pointer;
+    }
+</style>
+
 @endsection
\ No newline at end of file
diff --git a/resources/views/pages/santri/counting.blade.php b/resources/views/pages/santri/counting.blade.php
index 80d1900..3fec3ea 100644
--- a/resources/views/pages/santri/counting.blade.php
+++ b/resources/views/pages/santri/counting.blade.php
@@ -90,15 +90,6 @@
                                     </strong>
                                 </td>
                             </tr>
-                            <tr>
-                                <th><i class='bx bx-calculator'></i> Hasil</th>
-                                <td>
-                                    <span
-                                        class="badge {{ $latest->status === 'Tercapai' ? 'bg-success' : 'bg-danger' }}">
-                                        {{ $latest->status }}
-                                    </span>
-                                </td>
-                            </tr>
 
                             {{-- Perhitungan detail target keseluruhan --}}
                             @php
@@ -182,6 +173,15 @@ class="badge {{ $latest->status === 'Tercapai' ? 'bg-success' : 'bg-danger' }}">
                                                 @endif
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <th><i class='bx bx-calculator'></i> Hasil</th>
+                                            <td>
+                                                <span
+                                                    class="badge {{ $latest->status === 'Tercapai' ? 'bg-success' : 'bg-danger' }}">
+                                                    {{ $latest->status }}
+                                                </span>
+                                            </td>
+                                        </tr>
 
                         </table>
                     </div>
diff --git a/resources/views/pages/santri/dashboard.blade.php b/resources/views/pages/santri/dashboard.blade.php
index d961f81..fd77242 100644
--- a/resources/views/pages/santri/dashboard.blade.php
+++ b/resources/views/pages/santri/dashboard.blade.php
@@ -3,28 +3,29 @@
 @section('content')
 <style>
     .verification-card {
-    background-color: #f8f9fa;
-    border-left: 5px solid #ffc107;
-    transition: transform 0.3s ease, box-shadow 0.3s ease;
+        background-color: #f8f9fa;
+        border-left: 5px solid #ffc107;
+        transition: transform 0.3s ease, box-shadow 0.3s ease;
     }
-    
+
     .verification-card:hover {
-    transform: scale(1.02);
-    box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+        transform: scale(1.02);
+        box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
     }
-    
+
     .verification-card .card-icon {
-    width: 50px;
-    height: 50px;
-    background-color: #ffc107;
-    color: white;
-    font-size: 1.8rem;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+        width: 50px;
+        height: 50px;
+        background-color: #ffc107;
+        color: white;
+        font-size: 1.8rem;
+        box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
     }
-    
-    .text-success, .text-danger {
-    font-size: 1.3rem;
-    font-weight: bold;
+
+    .text-success,
+    .text-danger {
+        font-size: 1.3rem;
+        font-weight: bold;
     }
 </style>
 <main id="main" class="main">
@@ -65,7 +66,7 @@
                             @endif
                         </div>
 
-                        
+
                     </div>
                 </div>
             </div>
@@ -74,6 +75,49 @@
 
         <div class="col-12 dashboard">
             <div class="row">
+                <div class="col-xxl-12 col-md-12">
+                    <div class="row">
+                        <!-- Card Tanggal -->
+                        <div class="col-md-6">
+                            <div class="card info-card date-card shadow-lg"
+                                style="background-color: #f8f9fa; border-left: 5px solid #007bff;">
+                                <div class="card-body text-center">
+                                    <h5 class="card-title text-primary fw-bold">Tanggal Hari Ini</h5>
+                                    <div class="d-flex align-items-center justify-content-center">
+                                        <div
+                                            class="card-icon rounded-circle bg-primary text-white d-flex align-items-center justify-content-center p-3">
+                                            <i class='bx bx-calendar text-white' style="font-size: 1.5rem;"></i>
+                                        </div>
+                                        <div class="ps-3">
+                                            <h6 id="current-date" class="fw-semibold " style="color: #012970">Loading...
+                                            </h6>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- Card Waktu -->
+                        <div class="col-md-6">
+                            <div class="card info-card time-card shadow-lg"
+                                style="background-color: #f8f9fa; border-left: 5px solid #28a745;">
+                                <div class="card-body text-center">
+                                    <h5 class="card-title text-success fw-bold">Waktu Saat Ini</h5>
+                                    <div class="d-flex align-items-center justify-content-center">
+                                        <div
+                                            class="card-icon rounded-circle bg-success text-white d-flex align-items-center justify-content-center p-3">
+                                            <i class='bx bx-time text-white' style="font-size: 1.5rem;"></i>
+                                        </div>
+                                        <div class="ps-3">
+                                            <h6 id="current-time" class="fw-semibold " style="color: #012970">Loading...
+                                            </h6>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <!-- Al Quran Card -->
                 <div class="col-xxl-4 col-md-6">
                     <div class="card info-card sales-card">
@@ -145,49 +189,6 @@
                 <!-- End Hasil Klasifikasi Card -->
 
                 <!-- Waktu Card -->
-                <div class="col-xxl-12 col-md-12">
-                    <div class="row">
-                        <!-- Card Tanggal -->
-                        <div class="col-md-6">
-                            <div class="card info-card date-card shadow-lg"
-                                style="background-color: #f8f9fa; border-left: 5px solid #007bff;">
-                                <div class="card-body text-center">
-                                    <h5 class="card-title text-primary fw-bold">Tanggal Hari Ini</h5>
-                                    <div class="d-flex align-items-center justify-content-center">
-                                        <div
-                                            class="card-icon rounded-circle bg-primary text-white d-flex align-items-center justify-content-center p-3">
-                                            <i class='bx bx-calendar text-white' style="font-size: 1.5rem;"></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6 id="current-date" class="fw-semibold " style="color: #012970">Loading...
-                                            </h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <!-- Card Waktu -->
-                        <div class="col-md-6">
-                            <div class="card info-card time-card shadow-lg"
-                                style="background-color: #f8f9fa; border-left: 5px solid #28a745;">
-                                <div class="card-body text-center">
-                                    <h5 class="card-title text-success fw-bold">Waktu Saat Ini</h5>
-                                    <div class="d-flex align-items-center justify-content-center">
-                                        <div
-                                            class="card-icon rounded-circle bg-success text-white d-flex align-items-center justify-content-center p-3">
-                                            <i class='bx bx-time text-white' style="font-size: 1.5rem;"></i>
-                                        </div>
-                                        <div class="ps-3">
-                                            <h6 id="current-time" class="fw-semibold " style="color: #012970">Loading...
-                                            </h6>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>