diff --git a/Views/Data/BankSampahInduk/Index.cshtml b/Views/Data/BankSampahInduk/Index.cshtml
index d74781f..de0e185 100644
--- a/Views/Data/BankSampahInduk/Index.cshtml
+++ b/Views/Data/BankSampahInduk/Index.cshtml
@@ -24,37 +24,43 @@
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
             <input type="hidden" id="bank_sampah_induk_id" value="">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Nama Bank Sampah Induk" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nama" class="input" placeholder="Nama Bank Sampah Induk" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Tanggal Pendaftaran
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="date" id="tgl_pendaftaran" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] focus:outline-2 focus:outline-green-800" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Tanggal Pendaftaran
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="date" id="tgl_pendaftaran" class="input" required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Status
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <select id="status" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                        <option value="" class="text-gray-400">Pilih status</option>
-                        <option value="Aktif" class="text-slate-800">Aktif</option>
-                        <option value="Tidak Aktif" class="text-slate-800">Tidak Aktif</option>
-                    </select>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Status
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <select id="status" class="select" required>
+                            <option value="" disabled selected>Pilih status</option>
+                            <option value="Aktif">Aktif</option>
+                            <option value="Tidak Aktif">Tidak Aktif</option>
+                        </select>
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Data/HargaSampah/Index.cshtml b/Views/Data/HargaSampah/Index.cshtml
index f2db3fc..544c9a4 100644
--- a/Views/Data/HargaSampah/Index.cshtml
+++ b/Views/Data/HargaSampah/Index.cshtml
@@ -23,23 +23,27 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Data Harga Sampah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Subkategori Sampah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama_subkategori" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Nama Subkategori Sampah" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Subkategori Sampah
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama_subkategori" class="input" placeholder="Nama Subkategori Sampah" required />
+                    </fieldset>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Harga (Rp)
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="number" id="harga" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Harga (Rp)" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Harga (Rp)
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <input type="number" id="harga" class="input" placeholder="Harga (Rp)" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Data/Nasabah/Index.cshtml b/Views/Data/Nasabah/Index.cshtml
index ab31ab0..14923fa 100644
--- a/Views/Data/Nasabah/Index.cshtml
+++ b/Views/Data/Nasabah/Index.cshtml
@@ -24,55 +24,65 @@
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
             <input type="hidden" id="nasabah_id" value="">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Nama Nasabah" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nama" class="input" placeholder="Nama Nasabah" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Tanggal Pendaftaran
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="date" id="tgl_pendaftaran" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] focus:outline-2 focus:outline-green-800" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Tanggal Pendaftaran
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="date" id="tgl_pendaftaran" class="input" required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Status
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="status" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih status</option>
-                            <option value="Aktif" class="text-slate-800">Aktif</option>
-                            <option value="Tidak Aktif" class="text-slate-800">Tidak Aktif</option>
-                        </select>
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Status
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="status" class="select" required>
+                                <option value="" disabled selected>Pilih status</option>
+                                <option value="Aktif">Aktif</option>
+                                <option value="Tidak Aktif">Tidak Aktif</option>
+                            </select>
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Saldo Awal (Rp)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number" id="saldo_awal" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Saldo Awal" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Saldo Awal (Rp)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="saldo_awal" class="input" placeholder="Saldo Awal" required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 3 -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Status Penarikan
-                    </label>
-                    <input type="text" id="status_penarikan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Status Penarikan" />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Status Penarikan
+                        </legend>
+                        <input type="text" id="status_penarikan" class="input" placeholder="Status Penarikan" />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Data/Offtaker/Index.cshtml b/Views/Data/Offtaker/Index.cshtml
index ec6f009..ad07af5 100644
--- a/Views/Data/Offtaker/Index.cshtml
+++ b/Views/Data/Offtaker/Index.cshtml
@@ -23,164 +23,188 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Offtaker</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Nama Offtaker -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Offtaker
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama_offtaker" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Nama Offtaker" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Offtaker
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama_offtaker" class="input" placeholder="Nama Offtaker" required />
+                    </fieldset>
                 </div>
 
                 <!-- Email -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Email
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="email" id="email" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Email" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Email
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <input type="email" id="email" class="input" placeholder="Email" required />
+                    </fieldset>
                 </div>
 
                 <!-- No. HP -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        No. HP
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="tel" id="no_hp" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="No. HP" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            No. HP
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <input type="tel" id="no_hp" class="input" placeholder="No. HP" required />
+                    </fieldset>
                 </div>
 
                 <!-- Provinsi & Kota -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Provinsi
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="provinsi" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="DKI Jakarta" class="text-slate-800">DKI Jakarta</option>
-                        </select>
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Provinsi
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="provinsi" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="DKI Jakarta">DKI Jakarta</option>
+                            </select>
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kota
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kabupaten" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="Kota Adm. Jakarta Pusat" class="text-slate-800">Kota Adm. Jakarta Pusat</option>
-                            <option value="Kota Adm. Jakarta Utara" class="text-slate-800">Kota Adm. Jakarta Utara</option>
-                            <option value="Kota Adm. Jakarta Barat" class="text-slate-800">Kota Adm. Jakarta Barat</option>
-                            <option value="Kota Adm. Jakarta Selatan" class="text-slate-800">Kota Adm. Jakarta Selatan</option>
-                            <option value="Kota Adm. Jakarta Timur" class="text-slate-800">Kota Adm. Jakarta Timur</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kota
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kabupaten" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="Kota Adm. Jakarta Pusat">Kota Adm. Jakarta Pusat</option>
+                                <option value="Kota Adm. Jakarta Utara">Kota Adm. Jakarta Utara</option>
+                                <option value="Kota Adm. Jakarta Barat">Kota Adm. Jakarta Barat</option>
+                                <option value="Kota Adm. Jakarta Selatan">Kota Adm. Jakarta Selatan</option>
+                                <option value="Kota Adm. Jakarta Timur">Kota Adm. Jakarta Timur</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Kecamatan & Kelurahan -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kecamatan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kecamatan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="Jatinegara" class="text-slate-800">Jatinegara</option>
-                            <option value="Jagakarsa" class="text-slate-800">Jagakarsa</option>
-                            <option value="Pesanggrahan" class="text-slate-800">Pesanggrahan</option>
-                            <option value="Palmerah" class="text-slate-800">Palmerah</option>
-                            <option value="Menteng" class="text-slate-800">Menteng</option>
-                            <option value="Tanjung Priok" class="text-slate-800">Tanjung Priok</option>
-                            <option value="Cakung" class="text-slate-800">Cakung</option>
-                            <option value="Kebon Jeruk" class="text-slate-800">Kebon Jeruk</option>
-                            <option value="Pasar Minggu" class="text-slate-800">Pasar Minggu</option>
-                            <option value="Kramat Jati" class="text-slate-800">Kramat Jati</option>
-                            <option value="Tanah Abang" class="text-slate-800">Tanah Abang</option>
-                            <option value="Kemayoran" class="text-slate-800">Kemayoran</option>
-                            <option value="Kelapa Gading" class="text-slate-800">Kelapa Gading</option>
-                            <option value="Pulo Gadung" class="text-slate-800">Pulo Gadung</option>
-                            <option value="Matraman" class="text-slate-800">Matraman</option>
-                            <option value="Cipayung" class="text-slate-800">Cipayung</option>
-                            <option value="Pancoran" class="text-slate-800">Pancoran</option>
-                            <option value="Pasar Rebo" class="text-slate-800">Pasar Rebo</option>
-                            <option value="Makasar" class="text-slate-800">Makasar</option>
-                            <option value="Mampang Prapatan" class="text-slate-800">Mampang Prapatan</option>
-                        </select>
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kecamatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kecamatan" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="Jatinegara">Jatinegara</option>
+                                <option value="Jagakarsa">Jagakarsa</option>
+                                <option value="Pesanggrahan">Pesanggrahan</option>
+                                <option value="Palmerah">Palmerah</option>
+                                <option value="Menteng">Menteng</option>
+                                <option value="Tanjung Priok">Tanjung Priok</option>
+                                <option value="Cakung">Cakung</option>
+                                <option value="Kebon Jeruk">Kebon Jeruk</option>
+                                <option value="Pasar Minggu">Pasar Minggu</option>
+                                <option value="Kramat Jati">Kramat Jati</option>
+                                <option value="Tanah Abang">Tanah Abang</option>
+                                <option value="Kemayoran">Kemayoran</option>
+                                <option value="Kelapa Gading">Kelapa Gading</option>
+                                <option value="Pulo Gadung">Pulo Gadung</option>
+                                <option value="Matraman">Matraman</option>
+                                <option value="Cipayung">Cipayung</option>
+                                <option value="Pancoran">Pancoran</option>
+                                <option value="Pasar Rebo">Pasar Rebo</option>
+                                <option value="Makasar">Makasar</option>
+                                <option value="Mampang Prapatan">Mampang Prapatan</option>
+                            </select>
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kelurahan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kelurahan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="Kampung Melayu" class="text-slate-800">Kampung Melayu</option>
-                            <option value="Tanjung Barat" class="text-slate-800">Tanjung Barat</option>
-                            <option value="Petukangan Selatan" class="text-slate-800">Petukangan Selatan</option>
-                            <option value="Slipi" class="text-slate-800">Slipi</option>
-                            <option value="Gondangdia" class="text-slate-800">Gondangdia</option>
-                            <option value="Sunter Agung" class="text-slate-800">Sunter Agung</option>
-                            <option value="Cakung Timur" class="text-slate-800">Cakung Timur</option>
-                            <option value="Kelapa Dua" class="text-slate-800">Kelapa Dua</option>
-                            <option value="Pejaten Timur" class="text-slate-800">Pejaten Timur</option>
-                            <option value="Batu Ampar" class="text-slate-800">Batu Ampar</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kelurahan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kelurahan" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="Kampung Melayu">Kampung Melayu</option>
+                                <option value="Tanjung Barat">Tanjung Barat</option>
+                                <option value="Petukangan Selatan">Petukangan Selatan</option>
+                                <option value="Slipi">Slipi</option>
+                                <option value="Gondangdia">Gondangdia</option>
+                                <option value="Sunter Agung">Sunter Agung</option>
+                                <option value="Cakung Timur">Cakung Timur</option>
+                                <option value="Kelapa Dua">Kelapa Dua</option>
+                                <option value="Pejaten Timur">Pejaten Timur</option>
+                                <option value="Batu Ampar">Batu Ampar</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Alamat -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Alamat
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <textarea id="alamat" class="px-3.5 py-4 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 h-32 resize-none focus:outline-2 focus:outline-green-800" placeholder="Alamat" required></textarea>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Alamat
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <textarea id="alamat" class="textarea h-32" placeholder="Alamat" required></textarea>
+                    </fieldset>
                 </div>
 
                 <!-- RT, RW, Kode Pos -->
-                <div class="grid grid-cols-1 sm:grid-cols-3 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            RT
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="rt" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="RT" required />
+                <div class="grid grid-cols-1 sm:grid-cols-3 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                RT
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="rt" class="input" placeholder="RT" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            RW
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="rw" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="RW" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                RW
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="rw" class="input" placeholder="RW" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kode Pos
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="kode_pos" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Kode Pos" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kode Pos
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="kode_pos" class="input" placeholder="Kode Pos" required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Status (only in edit mode) -->
-                <div class="flex flex-col gap-1.5" id="status_wrapper" style="display: none;">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Status
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <select id="status" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800">
-                        <option value="" class="text-gray-400">Pilih status</option>
-                        <option value="Disetujui" class="text-slate-800">Disetujui</option>
-                        <option value="Belum Disetujui" class="text-slate-800">Belum Disetujui</option>
-                        <option value="Tidak Disetujui" class="text-slate-800">Tidak Disetujui</option>
-                    </select>
+                <div class="flex flex-col" id="status_wrapper" style="display: none;">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Status
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <select id="status" class="select">
+                            <option value="" disabled selected>Pilih status</option>
+                            <option value="Disetujui">Disetujui</option>
+                            <option value="Belum Disetujui">Belum Disetujui</option>
+                            <option value="Tidak Disetujui">Tidak Disetujui</option>
+                        </select>
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Main/BankSampahNasabah/Index.cshtml b/Views/Main/BankSampahNasabah/Index.cshtml
index 49ebf11..a988ecb 100644
--- a/Views/Main/BankSampahNasabah/Index.cshtml
+++ b/Views/Main/BankSampahNasabah/Index.cshtml
@@ -23,52 +23,56 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Bank Sampah Saya</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Kelurahan
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <select id="kelurahan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                        <option value="" class="text-gray-400">Pilih salah satu</option>
-                        <option value="Kalisari" class="text-slate-800">Kalisari</option>
-                        <option value="Pasar Minggu" class="text-slate-800">Pasar Minggu</option>
-                        <option value="Cipayung" class="text-slate-800">Cipayung</option>
-                        <option value="Ciracas" class="text-slate-800">Ciracas</option>
-                        <option value="Cilandak" class="text-slate-800">Cilandak</option>
-                        <option value="Cakung" class="text-slate-800">Cakung</option>
-                        <option value="Duren Sawit" class="text-slate-800">Duren Sawit</option>
-                        <option value="Kebayoran Baru" class="text-slate-800">Kebayoran Baru</option>
-                        <option value="Tebet" class="text-slate-800">Tebet</option>
-                        <option value="Menteng" class="text-slate-800">Menteng</option>
-                    </select>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Kelurahan
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <select id="kelurahan" class="select" required>
+                            <option value="" disabled selected>Pilih salah satu</option>
+                            <option value="Kalisari">Kalisari</option>
+                            <option value="Pasar Minggu">Pasar Minggu</option>
+                            <option value="Cipayung">Cipayung</option>
+                            <option value="Ciracas">Ciracas</option>
+                            <option value="Cilandak">Cilandak</option>
+                            <option value="Cakung">Cakung</option>
+                            <option value="Duren Sawit">Duren Sawit</option>
+                            <option value="Kebayoran Baru">Kebayoran Baru</option>
+                            <option value="Tebet">Tebet</option>
+                            <option value="Menteng">Menteng</option>
+                        </select>
+                    </fieldset>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Daftar Bank Sampah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <select id="daftar_bank_sampah" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                        <option value="" class="text-gray-400">Pilih Bank Sampah...</option>
-                        <option value="RW 09 Kalisari" class="text-slate-800">RW 09 Kalisari</option>
-                        <option value="Berkah Sampah" class="text-slate-800">Berkah Sampah</option>
-                        <option value="Pelangi Persada" class="text-slate-800">Pelangi Persada</option>
-                        <option value="Eco Makmur" class="text-slate-800">Eco Makmur</option>
-                        <option value="Griya Daur Ulang" class="text-slate-800">Griya Daur Ulang</option>
-                        <option value="Bank Sampah Induk" class="text-slate-800">Bank Sampah Induk</option>
-                        <option value="Ceria Hijau" class="text-slate-800">Ceria Hijau</option>
-                        <option value="Hijau Lestari" class="text-slate-800">Hijau Lestari</option>
-                        <option value="Sahabat Bumi" class="text-slate-800">Sahabat Bumi</option>
-                        <option value="Bersih Sejahtera" class="text-slate-800">Bersih Sejahtera</option>
-                        <option value="Karya Mandiri" class="text-slate-800">Karya Mandiri</option>
-                        <option value="Bumi Asri" class="text-slate-800">Bumi Asri</option>
-                        <option value="Lestari Alam" class="text-slate-800">Lestari Alam</option>
-                        <option value="Mandiri Sejahtera" class="text-slate-800">Mandiri Sejahtera</option>
-                        <option value="Cahaya Bersih" class="text-slate-800">Cahaya Bersih</option>
-                    </select>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Daftar Bank Sampah
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <select id="daftar_bank_sampah" class="select" required>
+                            <option value="" disabled selected>Pilih Bank Sampah...</option>
+                            <option value="RW 09 Kalisari">RW 09 Kalisari</option>
+                            <option value="Berkah Sampah">Berkah Sampah</option>
+                            <option value="Pelangi Persada">Pelangi Persada</option>
+                            <option value="Eco Makmur">Eco Makmur</option>
+                            <option value="Griya Daur Ulang">Griya Daur Ulang</option>
+                            <option value="Bank Sampah Induk">Bank Sampah Induk</option>
+                            <option value="Ceria Hijau">Ceria Hijau</option>
+                            <option value="Hijau Lestari">Hijau Lestari</option>
+                            <option value="Sahabat Bumi">Sahabat Bumi</option>
+                            <option value="Bersih Sejahtera">Bersih Sejahtera</option>
+                            <option value="Karya Mandiri">Karya Mandiri</option>
+                            <option value="Bumi Asri">Bumi Asri</option>
+                            <option value="Lestari Alam">Lestari Alam</option>
+                            <option value="Mandiri Sejahtera">Mandiri Sejahtera</option>
+                            <option value="Cahaya Bersih">Cahaya Bersih</option>
+                        </select>
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Main/Composting/Index.cshtml b/Views/Main/Composting/Index.cshtml
index 5680312..649e34e 100644
--- a/Views/Main/Composting/Index.cshtml
+++ b/Views/Main/Composting/Index.cshtml
@@ -23,138 +23,135 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Transaksi BSI</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false" />
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1: Tanggal Pencatatan & Nama Bank Sampah -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
                     <!-- Tanggal Pencatatan -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Tanggal Pencatatan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="date"
-                               id="tgl_pencatatan"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] focus:outline-2 focus:outline-green-800"
-                               placeholder="dd/mm/yyyy"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Tanggal Pencatatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="date" id="tgl_pencatatan" class="input" placeholder="dd/mm/yyyy" required />
+                        </fieldset>
                     </div>
 
                     <!-- Nama Bank Sampah -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Bank Sampah
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="nama_bank_sampah" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Nama Bank Sampah</option>
-                            <option value="Berkah Sampah" class="text-slate-800">Berkah Sampah</option>
-                            <option value="Pelangi Persada" class="text-slate-800">Pelangi Persada</option>
-                            <option value="Eco Makmur" class="text-slate-800">Eco Makmur</option>
-                            <option value="Griya Daur Ulang" class="text-slate-800">Griya Daur Ulang</option>
-                            <option value="Bank Sampah Induk" class="text-slate-800">Bank Sampah Induk</option>
-                            <option value="Ceria Hijau" class="text-slate-800">Ceria Hijau</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Bank Sampah
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="nama_bank_sampah" class="select" required>
+                                <option value="" disabled selected>Pilih Nama Bank Sampah</option>
+                                <option value="Berkah Sampah">Berkah Sampah</option>
+                                <option value="Pelangi Persada">Pelangi Persada</option>
+                                <option value="Eco Makmur">Eco Makmur</option>
+                                <option value="Griya Daur Ulang">Griya Daur Ulang</option>
+                                <option value="Bank Sampah Induk">Bank Sampah Induk</option>
+                                <option value="Ceria Hijau">Ceria Hijau</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2: Nama Penanggung Jawab & Jenis Sampah Organik -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
                     <!-- Nama Penanggung Jawab -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Penanggung Jawab
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text"
-                               id="nama_penanggung_jawab"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Nama Penanggung Jawab"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Penanggung Jawab
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nama_penanggung_jawab" class="input" placeholder="Nama Penanggung Jawab" required />
+                        </fieldset>
                     </div>
 
                     <!-- Jenis Sampah Organik -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jenis Sampah Organik
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="jenis_sampah_organik" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="Rumput" class="text-slate-800">Rumput</option>
-                            <option value="Buah Busuk" class="text-slate-800">Buah Busuk</option>
-                            <option value="Jerami" class="text-slate-800">Jerami</option>
-                            <option value="Sayuran" class="text-slate-800">Sayuran</option>
-                            <option value="Daun Kering" class="text-slate-800">Daun Kering</option>
-                            <option value="Sisa Makanan" class="text-slate-800">Sisa Makanan</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jenis Sampah Organik
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="jenis_sampah_organik" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="Rumput">Rumput</option>
+                                <option value="Buah Busuk">Buah Busuk</option>
+                                <option value="Jerami">Jerami</option>
+                                <option value="Sayuran">Sayuran</option>
+                                <option value="Daun Kering">Daun Kering</option>
+                                <option value="Sisa Makanan">Sisa Makanan</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 3: Jumlah Sampah Masuk & Jumlah Kompos -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
                     <!-- Jumlah Sampah Masuk -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jumlah Sampah Masuk (Kg)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number"
-                               id="jumlah_sampah_masuk"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Jumlah Sampah Masuk (Kg)"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jumlah Sampah Masuk (Kg)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="jumlah_sampah_masuk" class="input" placeholder="Jumlah Sampah Masuk (Kg)" required />
+                        </fieldset>
                     </div>
 
                     <!-- Jumlah Kompos yang dihasilkan -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jumlah Kompos yang dihasilkan (Kg)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number"
-                               id="jumlah_kompos_dihasilkan"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Jumlah Kompos yang dihasilkan (Kg)"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jumlah Kompos yang dihasilkan (Kg)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="jumlah_kompos_dihasilkan" class="input" placeholder="Jumlah Kompos yang dihasilkan (Kg)" required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 4: Lama Proses & Status Validasi -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
                     <!-- Lama Proses -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Lama Proses (Hari)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number"
-                               id="lama_proses"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Lama Proses (Hari)"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Lama Proses (Hari)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="lama_proses" class="input" placeholder="Lama Proses (Hari)" required />
+                        </fieldset>
                     </div>
 
                     <!-- Status Validasi -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Status Validasi
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="status_validasi" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="Disetujui" class="text-slate-800">Disetujui</option>
-                            <option value="Belum Disetujui" class="text-slate-800">Belum Disetujui</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Status Validasi
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="status_validasi" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="Disetujui">Disetujui</option>
+                                <option value="Belum Disetujui">Belum Disetujui</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 5: Catatan -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Catatan
-                    </label>
-                    <textarea id="catatan" class="px-3.5 py-4 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 h-32 resize-none focus:outline-2 focus:outline-green-800"
-                              placeholder="Catatan"></textarea>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Catatan
+                        </legend>
+                        <textarea id="catatan" class="textarea h-32" placeholder="Catatan"></textarea>
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
@@ -180,7 +177,7 @@
 
 <!-- Modal Validasi Data -->
 <dialog id="modal_validasi" class="modal modal-bottom sm:modal-middle">
-    <div class="modal-box w-full max-w-[591px] p-6 bg-white rounded-2xl inline-flex flex-col justify-center items-end gap-6">
+    <div class="modal-box w-full max-w-[591px] p-6 bg-white rounded-2xl inline-flex flex-col justify-center items-end gap-2">
         <!-- Header -->
         <div class="self-stretch inline-flex justify-between items-center">
             <div class="flex-1 justify-start text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8">Validasi Data</div>
diff --git a/Views/Main/DataBankSampah/Index.cshtml b/Views/Main/DataBankSampah/Index.cshtml
index b9cd022..180644b 100644
--- a/Views/Main/DataBankSampah/Index.cshtml
+++ b/Views/Main/DataBankSampah/Index.cshtml
@@ -27,92 +27,106 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Data Bank Sampah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Bank Sampah
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Nama Bank Sampah" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Bank Sampah
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nama" class="input" placeholder="Nama Bank Sampah" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kabupaten
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kabupaten" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Kabupaten</option>
-                            <option value="Kota Adm Jakarta Timur" class="text-slate-800">Kota Adm Jakarta Timur</option>
-                            <option value="Kota Adm Jakarta Barat" class="text-slate-800">Kota Adm Jakarta Barat</option>
-                            <option value="Kota Adm Jakarta Selatan" class="text-slate-800">Kota Adm Jakarta Selatan</option>
-                            <option value="Kota Adm Jakarta Utara" class="text-slate-800">Kota Adm Jakarta Utara</option>
-                            <option value="Kota Adm Jakarta Pusat" class="text-slate-800">Kota Adm Jakarta Pusat</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kabupaten
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kabupaten" class="select" required>
+                                <option value="" disabled selected>Pilih Kabupaten</option>
+                                <option value="Kota Adm Jakarta Timur">Kota Adm Jakarta Timur</option>
+                                <option value="Kota Adm Jakarta Barat">Kota Adm Jakarta Barat</option>
+                                <option value="Kota Adm Jakarta Selatan">Kota Adm Jakarta Selatan</option>
+                                <option value="Kota Adm Jakarta Utara">Kota Adm Jakarta Utara</option>
+                                <option value="Kota Adm Jakarta Pusat">Kota Adm Jakarta Pusat</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kecamatan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="kecamatan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Kecamatan" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kecamatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="kecamatan" class="input" placeholder="Kecamatan" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kelurahan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="kelurahan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Kelurahan" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kelurahan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="kelurahan" class="input" placeholder="Kelurahan" required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 3 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jenis Bank Sampah
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="jenis" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Jenis</option>
-                            <option value="BSU" class="text-slate-800">BSU</option>
-                            <option value="BSI" class="text-slate-800">BSI</option>
-                        </select>
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jenis Bank Sampah
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="jenis" class="select" required>
+                                <option value="" disabled selected>Pilih Jenis</option>
+                                <option value="BSU">BSU</option>
+                                <option value="BSI">BSI</option>
+                            </select>
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kategori Bank Sampah
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kategori" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Kategori</option>
-                            <option value="Warga" class="text-slate-800">Warga</option>
-                            <option value="Sekolah" class="text-slate-800">Sekolah</option>
-                            <option value="Perusahaan" class="text-slate-800">Perusahaan</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kategori Bank Sampah
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kategori" class="select" required>
+                                <option value="" disabled selected>Pilih Kategori</option>
+                                <option value="Warga">Warga</option>
+                                <option value="Sekolah">Sekolah</option>
+                                <option value="Perusahaan">Perusahaan</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 4 -->
-                <div class="grid grid-cols-1 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Status
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="status" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Status</option>
-                            <option value="Disetujui" class="text-slate-800">Disetujui</option>
-                            <option value="Belum Disetujui" class="text-slate-800">Belum Disetujui</option>
-                        </select>
+                <div class="grid grid-cols-1 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Status
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="status" class="select" required>
+                                <option value="" disabled selected>Pilih Status</option>
+                                <option value="Disetujui">Disetujui</option>
+                                <option value="Belum Disetujui">Belum Disetujui</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
diff --git a/Views/Main/DataOfftaker/Index.cshtml b/Views/Main/DataOfftaker/Index.cshtml
index 4936052..ddebfc4 100644
--- a/Views/Main/DataOfftaker/Index.cshtml
+++ b/Views/Main/DataOfftaker/Index.cshtml
@@ -49,65 +49,73 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Data Offtaker</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Offtaker
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="Nama Offtaker" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Offtaker
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nama" class="input" placeholder="Nama Offtaker" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kabupaten
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kabupaten" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Kabupaten</option>
-                            <option value="Kota Adm Jakarta Timur" class="text-slate-800">Kota Adm Jakarta Timur</option>
-                            <option value="Kota Adm Jakarta Barat" class="text-slate-800">Kota Adm Jakarta Barat</option>
-                            <option value="Kota Adm Jakarta Selatan" class="text-slate-800">Kota Adm Jakarta Selatan</option>
-                            <option value="Kota Adm Jakarta Utara" class="text-slate-800">Kota Adm Jakarta Utara</option>
-                            <option value="Kota Adm Jakarta Pusat" class="text-slate-800">Kota Adm Jakarta Pusat</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kabupaten
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kabupaten" class="select" required>
+                                <option value="" disabled selected>Pilih Kabupaten</option>
+                                <option value="Kota Adm Jakarta Timur">Kota Adm Jakarta Timur</option>
+                                <option value="Kota Adm Jakarta Barat">Kota Adm Jakarta Barat</option>
+                                <option value="Kota Adm Jakarta Selatan">Kota Adm Jakarta Selatan</option>
+                                <option value="Kota Adm Jakarta Utara">Kota Adm Jakarta Utara</option>
+                                <option value="Kota Adm Jakarta Pusat">Kota Adm Jakarta Pusat</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Kecamatan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="kecamatan" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Kecamatan</option>
-                            <option value="Cipayung" class="text-slate-800">Cipayung</option>
-                            <option value="Matraman" class="text-slate-800">Matraman</option>
-                            <option value="Kramat Jati" class="text-slate-800">Kramat Jati</option>
-                            <option value="Pulogadung" class="text-slate-800">Pulogadung</option>
-                            <option value="Cakung" class="text-slate-800">Cakung</option>
-                            <option value="Jatinegara" class="text-slate-800">Jatinegara</option>
-                            <option value="Pasar Rebo" class="text-slate-800">Pasar Rebo</option>
-                            <option value="Makasar" class="text-slate-800">Makasar</option>
-                            <option value="Duren Sawit" class="text-slate-800">Duren Sawit</option>
-                            <option value="Pulo Gadung" class="text-slate-800">Pulo Gadung</option>
-                        </select>
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Kecamatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="kecamatan" class="select" required>
+                                <option value="" disabled selected>Pilih Kecamatan</option>
+                                <option value="Cipayung">Cipayung</option>
+                                <option value="Matraman">Matraman</option>
+                                <option value="Kramat Jati">Kramat Jati</option>
+                                <option value="Pulogadung">Pulogadung</option>
+                                <option value="Cakung">Cakung</option>
+                                <option value="Jatinegara">Jatinegara</option>
+                                <option value="Pasar Rebo">Pasar Rebo</option>
+                                <option value="Makasar">Makasar</option>
+                                <option value="Duren Sawit">Duren Sawit</option>
+                                <option value="Pulo Gadung">Pulo Gadung</option>
+                            </select>
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Status Validasi
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="status" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih status</option>
-                            <option value="Disetujui" class="text-slate-800">Disetujui</option>
-                            <option value="Tidak Disetujui" class="text-slate-800">Tidak Disetujui</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Status Validasi
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="status" class="select" required>
+                                <option value="" disabled selected>Pilih status</option>
+                                <option value="Disetujui">Disetujui</option>
+                                <option value="Tidak Disetujui">Tidak Disetujui</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
diff --git a/Views/Main/Maggot/Index.cshtml b/Views/Main/Maggot/Index.cshtml
index 824b0c2..f9462b5 100644
--- a/Views/Main/Maggot/Index.cshtml
+++ b/Views/Main/Maggot/Index.cshtml
@@ -23,118 +23,134 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Data Maggot</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1: Tanggal Pencatatan & Nama Bank Sampah -->
                 <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
                     <!-- Tanggal Pencatatan -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Tanggal Pencatatan
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="date" id="tgl_pencatatan"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] focus:outline-2 focus:outline-green-800"
-                               placeholder="dd/mm/yyyy"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Tanggal Pencatatan
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="date" id="tgl_pencatatan"
+                                   class="input"
+                                   placeholder="dd/mm/yyyy"
+                                   required />
+                        </fieldset>
                     </div>
 
                     <!-- Nama Bank Sampah -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Bank Sampah
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="nama_bank_sampah" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Nama Bank Sampah</option>
-                            <option value="Berkah Sampah" class="text-slate-800">Berkah Sampah</option>
-                            <option value="Pelangi Persada" class="text-slate-800">Pelangi Persada</option>
-                            <option value="Eco Makmur" class="text-slate-800">Eco Makmur</option>
-                            <option value="Griya Daur Ulang" class="text-slate-800">Griya Daur Ulang</option>
-                            <option value="Bank Sampah Induk" class="text-slate-800">Bank Sampah Induk</option>
-                            <option value="Ceria Hijau" class="text-slate-800">Ceria Hijau</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Bank Sampah
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="nama_bank_sampah" class="select" required>
+                                <option value="" disabled selected>Nama Bank Sampah</option>
+                                <option value="Berkah Sampah">Berkah Sampah</option>
+                                <option value="Pelangi Persada">Pelangi Persada</option>
+                                <option value="Eco Makmur">Eco Makmur</option>
+                                <option value="Griya Daur Ulang">Griya Daur Ulang</option>
+                                <option value="Bank Sampah Induk">Bank Sampah Induk</option>
+                                <option value="Ceria Hijau">Ceria Hijau</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2: Nama Penanggung Jawab & Jenis Sampah Organik -->
                 <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
                     <!-- Nama Penanggung Jawab -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Penanggung Jawab
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="nama_penanggung_jawab"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Nama Penanggung Jawab"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Penanggung Jawab
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nama_penanggung_jawab"
+                                   class="input"
+                                   placeholder="Nama Penanggung Jawab"
+                                   required />
+                        </fieldset>
                     </div>
 
                     <!-- Jenis Sampah Organik -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jenis Sampah Organik
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="jenis_sampah_organik" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih salah satu</option>
-                            <option value="Rumput" class="text-slate-800">Rumput</option>
-                            <option value="Buah Busuk" class="text-slate-800">Buah Busuk</option>
-                            <option value="Jerami" class="text-slate-800">Jerami</option>
-                            <option value="Sayuran" class="text-slate-800">Sayuran</option>
-                            <option value="Daun Kering" class="text-slate-800">Daun Kering</option>
-                            <option value="Sisa Makanan" class="text-slate-800">Sisa Makanan</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jenis Sampah Organik
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="jenis_sampah_organik" class="select" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="Rumput">Rumput</option>
+                                <option value="Buah Busuk">Buah Busuk</option>
+                                <option value="Jerami">Jerami</option>
+                                <option value="Sayuran">Sayuran</option>
+                                <option value="Daun Kering">Daun Kering</option>
+                                <option value="Sisa Makanan">Sisa Makanan</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 3: Jumlah Sampah Masuk & Jumlah Maggot -->
                 <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
                     <!-- Jumlah Sampah Masuk -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jumlah Sampah Masuk (Kg)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number" id="jumlah_sampah_masuk"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Jumlah Sampah Masuk (Kg)"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jumlah Sampah Masuk (Kg)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="jumlah_sampah_masuk"
+                                   class="input"
+                                   placeholder="Jumlah Sampah Masuk (Kg)"
+                                   required />
+                        </fieldset>
                     </div>
 
                     <!-- Jumlah Maggot yang dihasilkan -->
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Jumlah Maggot yang dihasilkan (Kg)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number" id="jumlah_maggot_dihasilkan"
-                               class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800"
-                               placeholder="Jumlah Maggot yang dihasilkan (Kg)"
-                               required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Jumlah Maggot yang dihasilkan (Kg)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="jumlah_maggot_dihasilkan"
+                                   class="input"
+                                   placeholder="Jumlah Maggot yang dihasilkan (Kg)"
+                                   required />
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 4: Status Validasi -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Status Validasi
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <select id="status_validasi" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                        <option value="" class="text-gray-400">Pilih salah satu</option>
-                        <option value="Disetujui" class="text-slate-800">Disetujui</option>
-                        <option value="Belum Disetujui" class="text-slate-800">Belum Disetujui</option>
-                    </select>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Status Validasi
+                            <span class="text-red-500">*</span>
+                        </legend>
+                        <select id="status_validasi" class="select" required>
+                            <option value="" disabled selected>Pilih salah satu</option>
+                            <option value="Disetujui">Disetujui</option>
+                            <option value="Belum Disetujui">Belum Disetujui</option>
+                        </select>
+                    </fieldset>
                 </div>
 
                 <!-- Row 5: Catatan -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Catatan
-                    </label>
-                    <textarea id="catatan" class="px-3.5 py-4 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 h-32 resize-none focus:outline-2 focus:outline-green-800"
-                              placeholder="Catatan"></textarea>
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Catatan
+                        </legend>
+                        <textarea id="catatan" class="textarea h-32"
+                                  placeholder="Catatan"></textarea>
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Main/ProfilNasabah/Edit.cshtml b/Views/Main/ProfilNasabah/Edit.cshtml
index 5cb4dc6..217bf3c 100644
--- a/Views/Main/ProfilNasabah/Edit.cshtml
+++ b/Views/Main/ProfilNasabah/Edit.cshtml
@@ -45,7 +45,7 @@
             </div>
             <div class="divider"></div>
 
-            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-6">
+            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-2">
                 <div class="flex flex-col">
                     <fieldset class="fieldset">
                         <legend class="fieldset-legend">
@@ -66,7 +66,7 @@
                 </div>
             </div>
 
-            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-6">
+            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-2">
                 <div class="flex flex-col">
                     <fieldset class="fieldset">
                         <legend class="fieldset-legend">
@@ -101,7 +101,7 @@
                 </div>
             </div>
 
-            <div class="grid grid-cols-1 space-y-2 md:grid-cols-6 md:space-x-6">
+            <div class="grid grid-cols-1 space-y-2 md:grid-cols-6 md:space-x-2">
                 <div class="flex flex-col">
                     <fieldset class="fieldset">
                         <legend class="fieldset-legend">
@@ -131,7 +131,7 @@
                 </div>
             </div>
 
-            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-6">
+            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-2">
                 <div class="flex flex-col">
                     <fieldset class="fieldset">
                         <legend class="fieldset-legend">
@@ -164,7 +164,7 @@
                 </div>
             </div>
 
-            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-6">
+            <div class="grid grid-cols-1 space-y-2 md:grid-cols-4 md:space-x-2">
                 <div class="flex flex-col">
                     <fieldset class="fieldset">
                         <legend class="fieldset-legend">
diff --git a/Views/Main/TransaksiNasabah/Index.cshtml b/Views/Main/TransaksiNasabah/Index.cshtml
index 8b36a1f..3947dc5 100644
--- a/Views/Main/TransaksiNasabah/Index.cshtml
+++ b/Views/Main/TransaksiNasabah/Index.cshtml
@@ -23,59 +23,67 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Transaksi</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Row 1 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Tanggal Transaksi
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="date" id="tgl_transaksi" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] focus:outline-2 focus:outline-green-800" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Tanggal Transaksi
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="date" id="tgl_transaksi" class="input" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nama Bank Sampah
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <select id="nama_bank_samoah" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] text-slate-800 focus:outline-2 focus:outline-green-800" required>
-                            <option value="" class="text-gray-400">Pilih Bank Sampah</option>
-                            <option value="RW 09 Kalisari" class="text-slate-800">RW 09 Kalisari</option>
-                            <option value="Berkah Sampah" class="text-slate-800">Berkah Sampah</option>
-                            <option value="Pelangi Persada" class="text-slate-800">Pelangi Persada</option>
-                            <option value="Eco Makmur" class="text-slate-800">Eco Makmur</option>
-                            <option value="Griya Daur Ulang" class="text-slate-800">Griya Daur Ulang</option>
-                            <option value="Bank Sampah Induk" class="text-slate-800">Bank Sampah Induk</option>
-                            <option value="Ceria Hijau" class="text-slate-800">Ceria Hijau</option>
-                            <option value="Hijau Lestari" class="text-slate-800">Hijau Lestari</option>
-                            <option value="Sahabat Bumi" class="text-slate-800">Sahabat Bumi</option>
-                            <option value="Bersih Sejahtera" class="text-slate-800">Bersih Sejahtera</option>
-                            <option value="Karya Mandiri" class="text-slate-800">Karya Mandiri</option>
-                            <option value="Bumi Asri" class="text-slate-800">Bumi Asri</option>
-                            <option value="Lestari Alam" class="text-slate-800">Lestari Alam</option>
-                            <option value="Mandiri Sejahtera" class="text-slate-800">Mandiri Sejahtera</option>
-                            <option value="Cahaya Bersih" class="text-slate-800">Cahaya Bersih</option>
-                        </select>
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nama Bank Sampah
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <select id="nama_bank_samoah" class="select" required>
+                                <option value="" disabled selected>Pilih Bank Sampah</option>
+                                <option value="RW 09 Kalisari">RW 09 Kalisari</option>
+                                <option value="Berkah Sampah">Berkah Sampah</option>
+                                <option value="Pelangi Persada">Pelangi Persada</option>
+                                <option value="Eco Makmur">Eco Makmur</option>
+                                <option value="Griya Daur Ulang">Griya Daur Ulang</option>
+                                <option value="Bank Sampah Induk">Bank Sampah Induk</option>
+                                <option value="Ceria Hijau">Ceria Hijau</option>
+                                <option value="Hijau Lestari">Hijau Lestari</option>
+                                <option value="Sahabat Bumi">Sahabat Bumi</option>
+                                <option value="Bersih Sejahtera">Bersih Sejahtera</option>
+                                <option value="Karya Mandiri">Karya Mandiri</option>
+                                <option value="Bumi Asri">Bumi Asri</option>
+                                <option value="Lestari Alam">Lestari Alam</option>
+                                <option value="Mandiri Sejahtera">Mandiri Sejahtera</option>
+                                <option value="Cahaya Bersih">Cahaya Bersih</option>
+                            </select>
+                        </fieldset>
                     </div>
                 </div>
 
                 <!-- Row 2 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Nilai Transaksi (Rp)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="text" id="nilai_transaksi" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="150,000" required />
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Nilai Transaksi (Rp)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="text" id="nilai_transaksi" class="input" placeholder="150,000" required />
+                        </fieldset>
                     </div>
 
-                    <div class="flex flex-col gap-1.5">
-                        <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                            Total Sampah (Kg)
-                            <span class="text-red-500 text-sm font-semibold">*</span>
-                        </label>
-                        <input type="number" id="total_sampah" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800" placeholder="67" required />
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                Total Sampah (Kg)
+                                <span class="text-red-500">*</span>
+                            </legend>
+                            <input type="number" id="total_sampah" class="input" placeholder="67" required />
+                        </fieldset>
                     </div>
                 </div>
 
diff --git a/Views/Master/Aktivitas/Index.cshtml b/Views/Master/Aktivitas/Index.cshtml
index d223686..0482b4d 100644
--- a/Views/Master/Aktivitas/Index.cshtml
+++ b/Views/Master/Aktivitas/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Aktivitas</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama Aktivitas -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Aktivitas
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Aktivitas" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Aktivitas<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Aktivitas" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/Artikel/Index.cshtml b/Views/Master/Artikel/Index.cshtml
index 05716a6..cbe8794 100644
--- a/Views/Master/Artikel/Index.cshtml
+++ b/Views/Master/Artikel/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Artikel</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Artikel
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Artikel" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Artikel<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Artikel" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/BadanHukum/Index.cshtml b/Views/Master/BadanHukum/Index.cshtml
index 2e2fa20..ca18b8a 100644
--- a/Views/Master/BadanHukum/Index.cshtml
+++ b/Views/Master/BadanHukum/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Badan Hukum</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Badan Hukum
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Badan Hukum" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Badan Hukum<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Badan Hukum" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/Fasilitas/Index.cshtml b/Views/Master/Fasilitas/Index.cshtml
index 5d29188..621466f 100644
--- a/Views/Master/Fasilitas/Index.cshtml
+++ b/Views/Master/Fasilitas/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Fasilitas</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Fasilitas
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Fasilitas" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Fasilitas<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Fasilitas" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/JenisBankSampah/Index.cshtml b/Views/Master/JenisBankSampah/Index.cshtml
index 320442d..1f2769f 100644
--- a/Views/Master/JenisBankSampah/Index.cshtml
+++ b/Views/Master/JenisBankSampah/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Jenis Bank Sampah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Jenis Bank Sampah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Jenis Bank Sampah" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Jenis Bank Sampah<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Jenis Bank Sampah" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/JenisNasabah/Index.cshtml b/Views/Master/JenisNasabah/Index.cshtml
index 351c3b4..78b26af 100644
--- a/Views/Master/JenisNasabah/Index.cshtml
+++ b/Views/Master/JenisNasabah/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Jenis Nasabah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Jenis Nasabah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Jenis Nasabah" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Jenis Nasabah<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Jenis Nasabah" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/JenisPengolahan/Index.cshtml b/Views/Master/JenisPengolahan/Index.cshtml
index dacd255..394b55c 100644
--- a/Views/Master/JenisPengolahan/Index.cshtml
+++ b/Views/Master/JenisPengolahan/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Jenis Pengolahan</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Jenis Pengolahan
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Jenis Pengolahan" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Jenis Pengolahan<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Jenis Pengolahan" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/JenisSampah/Index.cshtml b/Views/Master/JenisSampah/Index.cshtml
index 9325ca6..c6f0172 100644
--- a/Views/Master/JenisSampah/Index.cshtml
+++ b/Views/Master/JenisSampah/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Jenis Sampah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Jenis Sampah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Jenis Sampah" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Jenis Sampah<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Jenis Sampah" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/Kategori/Index.cshtml b/Views/Master/Kategori/Index.cshtml
index b998e59..ad30161 100644
--- a/Views/Master/Kategori/Index.cshtml
+++ b/Views/Master/Kategori/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Kategori</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Kategori
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Kategori" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Kategori<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Kategori" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/KategoriFasilitas/Index.cshtml b/Views/Master/KategoriFasilitas/Index.cshtml
index 172dc2d..b285e1a 100644
--- a/Views/Master/KategoriFasilitas/Index.cshtml
+++ b/Views/Master/KategoriFasilitas/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Kategori Fasilitas</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Kategori Fasilitas
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Kategori Fasilitas" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Kategori Fasilitas<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Kategori Fasilitas" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/KategoriSampah/Index.cshtml b/Views/Master/KategoriSampah/Index.cshtml
index ff21a2a..ca1fb73 100644
--- a/Views/Master/KategoriSampah/Index.cshtml
+++ b/Views/Master/KategoriSampah/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Kategori Sampah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Kategori Sampah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Kategori Sampah" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Kategori Sampah<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Kategori Sampah" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/Mitra/Index.cshtml b/Views/Master/Mitra/Index.cshtml
index f45b3a0..37fb2b7 100644
--- a/Views/Master/Mitra/Index.cshtml
+++ b/Views/Master/Mitra/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Mitra</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Mitra
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Mitra" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Mitra<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Mitra" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/StatusLahan/Index.cshtml b/Views/Master/StatusLahan/Index.cshtml
index a541416..1ce32be 100644
--- a/Views/Master/StatusLahan/Index.cshtml
+++ b/Views/Master/StatusLahan/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Status Lahan</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Status Lahan
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Status Lahan" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Status Lahan<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Status Lahan" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->
diff --git a/Views/Master/SubKategoriSampah/Index.cshtml b/Views/Master/SubKategoriSampah/Index.cshtml
index 0eb75a9..74b0fa7 100644
--- a/Views/Master/SubKategoriSampah/Index.cshtml
+++ b/Views/Master/SubKategoriSampah/Index.cshtml
@@ -23,14 +23,15 @@
         <h3 id="modal_title" class="text-gray-900 text-xl font-semibold font-['Plus_Jakarta_Sans'] leading-8 mb-8">Tambah Sub Kategori Sampah</h3>
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
-            <div class="flex flex-col gap-6">
+            <div class="flex flex-col gap-2">
                 <!-- Field Nama -->
-                <div class="flex flex-col gap-1.5">
-                    <label class="text-slate-800 text-base font-normal font-['Plus_Jakarta_Sans'] leading-6">
-                        Nama Sub Kategori Sampah
-                        <span class="text-red-500 text-sm font-semibold">*</span>
-                    </label>
-                    <input type="text" id="nama" class="px-3.5 py-3 bg-white rounded-lg outline outline-1 outline-offset-[-1px] outline-gray-300 text-base font-['Plus_Jakarta_Sans'] placeholder:text-gray-400 focus:outline-2 focus:outline-green-800 w-full" placeholder="Nama Sub Kategori Sampah" required />
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Sub Kategori Sampah<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama" class="input" placeholder="Nama Sub Kategori Sampah" required />
+                    </fieldset>
                 </div>
 
                 <!-- Buttons -->