diff --git a/Controllers/Master/LokasiController.cs b/Controllers/Master/LokasiController.cs
index f8afa8d..0d5d1ec 100644
--- a/Controllers/Master/LokasiController.cs
+++ b/Controllers/Master/LokasiController.cs
@@ -15,160 +15,111 @@ namespace BankSampahApp.Controllers.Master
         {
             var data = new[]
             {
-                new {
-                    jenis_lokasi = "Bank Sampah",
-                    kota = "Jakarta Pusat",
-                    kecamatan = "Tanah Abang",
-                    kelurahan = "Cideng",
-                    rw = "002",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
                 new {
                     jenis_lokasi = "Maggot",
-                    kota = "Jakarta Selatan",
-                    kecamatan = "Mampang Prapatan",
-                    kelurahan = "Kuningan Barat",
-                    rw = "004",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Composting",
-                    kota = "Jakarta Timur",
-                    kecamatan = "Matraman",
-                    kelurahan = "Palmeriam",
-                    rw = "006",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Bank Sampah",
-                    kota = "Jakarta Utara",
-                    kecamatan = "Tanjung Priok",
-                    kelurahan = "Sunter Agung",
-                    rw = "005",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Maggot",
-                    kota = "Jakarta Barat",
-                    kecamatan = "Cengkareng",
-                    kelurahan = "Kapuk",
+                    nama_lokasi = "Jakarta Selatan",
+                    kecamatan = "Kebayoran Lama",
+                    kelurahan = "Pondok Pinang",
+                    detail_alamat = "Jl. Pinang Mas No. 12",
+                    rt = 4,
                     rw = "003",
                     aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
                 },
                 new {
-                    jenis_lokasi = "Composting",
-                    kota = "Jakarta Selatan",
-                    kecamatan = "Kebayoran Baru",
-                    kelurahan = "Gunung",
+                    jenis_lokasi = "Maggot",
+                    nama_lokasi = "Jakarta Timur",
+                    kecamatan = "Duren Sawit",
+                    kelurahan = "Klender",
+                    detail_alamat = "Jl. Puskesmas Raya No. 88",
+                    rt = 12,
+                    rw = "006",
+                    aksi = "<div class=\"flex gap-2\">" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
+                },
+                new {
+                    jenis_lokasi = "Komposting",
+                    nama_lokasi = "Jakarta Pusat",
+                    kecamatan = "Kemayoran",
+                    kelurahan = "Gunung Sahari Selatan",
+                    detail_alamat = "Jl. Garuda No. 14",
+                    rt = 6,
                     rw = "001",
                     aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Bank Sampah",
-                    kota = "Jakarta Timur",
-                    kecamatan = "Duren Sawit",
-                    kelurahan = "Pondok Bambu",
-                    rw = "007",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
                 },
                 new {
                     jenis_lokasi = "Maggot",
-                    kota = "Jakarta Pusat",
-                    kecamatan = "Kemayoran",
-                    kelurahan = "Serdang",
-                    rw = "008",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Composting",
-                    kota = "Jakarta Barat",
-                    kecamatan = "Grogol Petamburan",
-                    kelurahan = "Tomang",
+                    nama_lokasi = "Jakarta Utara",
+                    kecamatan = "Tanjung Priok",
+                    kelurahan = "Sunter Agung",
+                    detail_alamat = "Jl. Danau Sunter Utara Blok C1",
+                    rt = 3,
                     rw = "009",
                     aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
                 },
                 new {
-                    jenis_lokasi = "Bank Sampah",
-                    kota = "Jakarta Selatan",
+                    jenis_lokasi = "Komposting",
+                    nama_lokasi = "Jakarta Selatan",
                     kecamatan = "Setiabudi",
                     kelurahan = "Karet Kuningan",
-                    rw = "010",
+                    detail_alamat = "Jl. Karet Kuningan No. 21",
+                    rt = 9,
+                    rw = "004",
                     aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
                 },
                 new {
                     jenis_lokasi = "Maggot",
-                    kota = "Jakarta Utara",
-                    kecamatan = "Koja",
-                    kelurahan = "Tugu Utara",
-                    rw = "011",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Composting",
-                    kota = "Jakarta Timur",
+                    nama_lokasi = "Jakarta Timur",
                     kecamatan = "Cipayung",
                     kelurahan = "Setu",
-                    rw = "012",
+                    detail_alamat = "Jl. Raya Setu No. 8",
+                    rt = 5,
+                    rw = "003",
                     aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                },
-                new {
-                    jenis_lokasi = "Bank Sampah",
-                    kota = "Jakarta Barat",
-                    kecamatan = "Kembangan",
-                    kelurahan = "Meruya Utara",
-                    rw = "013",
-                    aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
                 },
                 new {
                     jenis_lokasi = "Maggot",
-                    kota = "Jakarta Selatan",
-                    kecamatan = "Pasar Minggu",
-                    kelurahan = "Pejaten Timur",
-                    rw = "014",
+                    nama_lokasi = "Jakarta Pusat",
+                    kecamatan = "Senen",
+                    kelurahan = "Kramat",
+                    detail_alamat = "Jl. Kramat Lontar No. 42",
+                    rt = 13,
+                    rw = "007",
                     aksi = "<div class=\"flex gap-2\">" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
-                        "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
-                        "</div>",
-                }, 
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
+                },
+                new {
+                    jenis_lokasi = "Komposting",
+                    nama_lokasi = "Jakarta Utara",
+                    kecamatan = "Penjaringan",
+                    kelurahan = "Pluit",
+                    detail_alamat = "Jl. Pluit Karang Timur No. 7",
+                    rt = 2,
+                    rw = "001",
+                    aksi = "<div class=\"flex gap-2\">" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-warning text-white btn-sm\"><i class=\"ph ph-note-pencil\"></i></a>" +
+                            "<a href=\"#\" class=\"btn btn-circle btn-error delete text-white btn-sm\"><i class=\"ph ph-trash\"></i></a>" +
+                            "</div>",
+                },
+
             };
 
             var response = new
diff --git a/Views/Main/ReduksiSampahSatpel/Index.cshtml b/Views/Main/ReduksiSampahSatpel/Index.cshtml
index 2ae045f..c00dda9 100644
--- a/Views/Main/ReduksiSampahSatpel/Index.cshtml
+++ b/Views/Main/ReduksiSampahSatpel/Index.cshtml
@@ -84,7 +84,7 @@
                             <legend class="fieldset-legend">
                                 Keterangan Kegiatan<span class="text-red-500">*</span>
                             </legend>
-                            <textarea id="keterangan_kegiatan" rows="4" readonly class="textarea textarea-bordered w-full"></textarea>
+                            <textarea id="keterangan_kegiatan" rows="4" required class="textarea textarea-bordered w-full"></textarea>
                         </fieldset>
                     </div>
 
diff --git a/Views/Master/Lokasi/Index.cshtml b/Views/Master/Lokasi/Index.cshtml
index de2efdd..988a3a6 100644
--- a/Views/Master/Lokasi/Index.cshtml
+++ b/Views/Master/Lokasi/Index.cshtml
@@ -41,7 +41,7 @@
         <form id="formTambah" onsubmit="submitForm(event)">
             <input type="hidden" id="edit_mode" value="false">
             <div class="flex flex-col gap-6">
-                <!-- Field Nama -->
+                <!-- Field Jenis Lokasi -->
                 <div class="flex flex-col">
                     <fieldset class="fieldset">
                         <legend class="fieldset-legend">
@@ -49,29 +49,24 @@
                         </legend>
                         <select id="jenis_lokasi" class="select w-full select2" required>
                             <option value="" disabled selected>Pilih Jenis Lokasi</option>
-                            <option value="">Bank Sampah</option>
-                            <option value="">Composting</option>
-                            <option value="">Maggot</option>
+                            <option>Komposting</option>
+                            <option>Maggot</option>
                         </select>
                     </fieldset>
                 </div>
 
+                <!-- Field Nama Lokasi -->
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Nama Lokasi<span class="text-red-500">*</span>
+                        </legend>
+                        <input type="text" id="nama_lokasi" class="input w-full" placeholder="Nama Lokasi" required />
+                    </fieldset>
+                </div>
+
                 <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
-                    <div class="flex flex-col">
-                        <fieldset class="fieldset">
-                            <legend class="fieldset-legend">
-                                Kota<span class="text-red-500">*</span>
-                            </legend>
-                            <select id="kota" class="select w-full select2" required>
-                                <option value="" disabled selected>Pilih salah satu</option>
-                                <option value="">Jakarta Barat</option>
-                                <option value="">Jakarta Pusat</option>
-                                <option value="">Jakarta Selatan</option>
-                                <option value="">Jakarta Timur</option>
-                                <option value="">Jakarta Utara</option>
-                            </select>
-                        </fieldset>
-                    </div>
+                    <!-- Field Kecamatan -->
                     <div class="flex flex-col">
                         <fieldset class="fieldset">
                             <legend class="fieldset-legend">
@@ -92,6 +87,8 @@
                             </select>
                         </fieldset>
                     </div>
+
+                    <!-- Field Kelurahan -->
                     <div class="flex flex-col">
                         <fieldset class="fieldset">
                             <legend class="fieldset-legend">
@@ -112,6 +109,28 @@
                             </select>
                         </fieldset>
                     </div>
+
+                    <!-- Field RT -->
+                    <div class="flex flex-col">
+                        <fieldset class="fieldset">
+                            <legend class="fieldset-legend">
+                                RT<span class="text-red-500">*</span>
+                            </legend>
+                            <select id="rw" class="select w-full select2" required>
+                                <option value="" disabled selected>Pilih salah satu</option>
+                                <option value="001">001</option>
+                                <option value="002">002</option>
+                                <option value="003">003</option>
+                                <option value="004">004</option>
+                                <option value="005">005</option>
+                                <option value="006">006</option>
+                                <option value="007">007</option>
+                                <option value="008">008</option>
+                                <option value="009">009</option>
+                                <option value="010">010</option>
+                            </select>
+                        </fieldset>
+                    </div>
                     <div class="flex flex-col">
                         <fieldset class="fieldset">
                             <legend class="fieldset-legend">
@@ -134,6 +153,15 @@
                     </div>
                 </div>
 
+                <!-- Field Detail Alamat -->
+                <div class="flex flex-col">
+                    <fieldset class="fieldset">
+                        <legend class="fieldset-legend">
+                            Detail Alamat<span class="text-red-500">*</span>
+                        </legend>
+                        <textarea id="detail_alamat" rows="4" required placeholder="Detail Alamat" class="textarea textarea-bordered w-full"></textarea>
+                    </fieldset>
+                </div>
                
 
                 <!-- Buttons -->
@@ -165,10 +193,12 @@
                     <tr>
                         <th class="w-[10%]">No</th>
                         <th class="w-[15%]">Jenis Lokasi</th>
-                        <th class="w-[20%]">Kota</th>
-                        <th class="w-[20%]">Kecamatan</th>
-                        <th class="w-[15%]">Kelurahan</th>
+                        <th class="w-[15%]">Nama Lokasi</th>
+                        <th class="w-[10%]">Kecamatan</th>
+                        <th class="w-[10%]">Kelurahan</th>
+                        <th class="w-[10%]">RT</th>
                         <th class="w-[10%]">RW</th>
+                        <th class="w-[10%]">Detail Alamat</th>
                         <th class="w-[10%]">Aksi</th>
                     </tr>
                 </thead>
@@ -199,10 +229,12 @@
             columns: [
                 { data: null, render: (d, t, r, m) => m.row + 1, orderable: false, searchable: false },
                 { data: 'jenis_lokasi' },
-                { data: 'kota' },
+                { data: 'nama_lokasi' },
                 { data: 'kecamatan' },
                 { data: 'kelurahan' },
+                { data: 'rt' },
                 { data: 'rw' },
+                { data: 'detail_alamat' },
                 { data: 'aksi', orderable: false, searchable: true },
             ]
         });