diff --git a/Views/Shared/_SidebarUnified.cshtml b/Views/Shared/_SidebarUnified.cshtml
index 2d78cdc..712043e 100644
--- a/Views/Shared/_SidebarUnified.cshtml
+++ b/Views/Shared/_SidebarUnified.cshtml
@@ -1,5 +1,10 @@
+@using Microsoft.AspNetCore.Mvc.Controllers
+
 @{
-    var controller = ViewContext.RouteData.Values["controller"] as string;
+    var d = ViewContext.ActionDescriptor as ControllerActionDescriptor;
+    var ns = d?.ControllerTypeInfo?.Namespace;
+    var module = ns?.Split('.').Last();
+    var controller = d?.ControllerName;
 }
 <label class="drawer-overlay" for="my-drawer-2" aria-label="close sidebar"></label>
 
@@ -69,37 +74,37 @@
 
             <!-- Data -->
             <li>
-                <details @(new[] { "Nasabah", "BankSampahInduk", "BankSampahUnit", "Aktivitas", "HargaSampah", "Offtaker", "PotensiRumah" }.Contains(controller) ? "open" : "")>
+                <details @(module == "Data" && new[] { "Nasabah", "BankSampahInduk", "BankSampahUnit", "Aktivitas", "HargaSampah", "Offtaker", "PotensiRumah" }.Contains(controller) ? "open" : "")>
                     <summary>
                         <i class="ph ph-database me-2 text-lg"></i>
                         Data
                     </summary>
                     <ul>
-                        <li><a href="/Data/Nasabah/Index" class="@(controller == "Nasabah" ? "menu-active" : "")">Nasabah</a></li>
-                        <li><a href="/Data/BankSampahInduk/Index" class="@(controller == "BankSampahInduk" ? "menu-active" : "")">Bank Sampah Induk</a></li>
-                        <li><a href="/Data/BankSampahUnit/Index" class="@(controller == "BankSampahUnit" ? "menu-active" : "")">Bank Sampah Unit</a></li>
-                        <li><a href="/Data/Aktivitas/Index" class="@(controller == "Aktivitas" ? "menu-active" : "")">Aktivitas</a></li>
-                        <li><a href="/Data/HargaSampah/Index" class="@(controller == "HargaSampah" ? "menu-active" : "")">Harga Sampah</a></li>
-                        <li><a href="/Data/Offtaker/Index" class="@(controller == "Offtaker" ? "menu-active" : "")">Offtaker</a></li>
-                        <li><a href="/Data/PotensiRumah/Index" class="@(controller == "PotensiRumah" ? "menu-active" : "")">Potensi Rumah</a></li>
+                        <li><a href="/Data/Nasabah/Index" class="@(module == "Data" && controller == "Nasabah" ? "menu-active" : "")">Nasabah</a></li>
+                        <li><a href="/Data/BankSampahInduk/Index" class="@(module == "Data" && controller == "BankSampahInduk" ? "menu-active" : "")">Bank Sampah Induk</a></li>
+                        <li><a href="/Data/BankSampahUnit/Index" class="@(module == "Data" && controller == "BankSampahUnit" ? "menu-active" : "")">Bank Sampah Unit</a></li>
+                        <li><a href="/Data/Aktivitas/Index" class="@(module == "Data" && controller == "Aktivitas" ? "menu-active" : "")">Aktivitas</a></li>
+                        <li><a href="/Data/HargaSampah/Index" class="@(module == "Data" && controller == "HargaSampah" ? "menu-active" : "")">Harga Sampah</a></li>
+                        <li><a href="/Data/Offtaker/Index" class="@(module == "Data" && controller == "Offtaker" ? "menu-active" : "")">Offtaker</a></li>
+                        <li><a href="/Data/PotensiRumah/Index" class="@(module == "Data" && controller == "PotensiRumah" ? "menu-active" : "")">Potensi Rumah</a></li>
                     </ul>
                 </details>
             </li>
 
             <!-- Transaksi -->
             <li>
-                <details @(new[] { "Nasabah", "PenarikanTabungan", "Bsi", "TransaksiOfftaker", "LaporanTransaksi", "SedekahSampah" }.Contains(controller) ? "open" : "")>
+                <details @(module == "Transaksi" && new[] { "Nasabah", "PenarikanTabungan", "Bsi", "TransaksiOfftaker", "LaporanTransaksi", "SedekahSampah" }.Contains(controller) ? "open" : "")>
                     <summary>
                         <i class="ph ph-cash-register me-2 text-lg"></i>
                         Transaksi
                     </summary>
                     <ul>
-                        <li><a href="/Transaksi/Nasabah/Index" class="@(controller == "Nasabah" ? "menu-active" : "")">Nasabah</a></li>
-                        <li><a href="/Transaksi/SedekahSampah/Index" class="@(controller == "SedekahSampah" ? "menu-active" : "")">Sedekah Sampah</a></li>
-                        <li><a href="/Transaksi/PenarikanTabungan/Index" class="@(controller == "PenarikanTabungan" ? "menu-active" : "")">Penarikan Tabungan</a></li>
-                        <li><a href="/Transaksi/Bsi/Index" class="@(controller == "Bsi" ? "menu-active" : "")">BSI</a></li>
-                        <li><a href="/Transaksi/TransaksiOfftaker/Index" class="@(controller == "TransaksiOfftaker" ? "menu-active" : "")">Offtaker</a></li>
-                        <li><a href="/Transaksi/LaporanTransaksi/Index" class="@(controller == "LaporanTransaksi" ? "menu-active" : "")">Laporan</a></li>
+                        <li><a href="/Transaksi/Nasabah/Index" class="@(module == "Transaksi" && controller == "Nasabah" ? "menu-active" : "")">Nasabah</a></li>
+                        <li><a href="/Transaksi/SedekahSampah/Index" class="@(module == "Transaksi" && controller == "SedekahSampah" ? "menu-active" : "")">Sedekah Sampah</a></li>
+                        <li><a href="/Transaksi/PenarikanTabungan/Index" class="@(module == "Transaksi" && controller == "PenarikanTabungan" ? "menu-active" : "")">Penarikan Tabungan</a></li>
+                        <li><a href="/Transaksi/Bsi/Index" class="@(module == "Transaksi" && controller == "Bsi" ? "menu-active" : "")">BSI</a></li>
+                        <li><a href="/Transaksi/TransaksiOfftaker/Index" class="@(module == "Transaksi" && controller == "TransaksiOfftaker" ? "menu-active" : "")">Offtaker</a></li>
+                        <li><a href="/Transaksi/LaporanTransaksi/Index" class="@(module == "Transaksi" && controller == "LaporanTransaksi" ? "menu-active" : "")">Laporan</a></li>
                     </ul>
                 </details>
             </li>
@@ -131,43 +136,43 @@
 
             <!-- Wilayah -->
             <li>
-                <details @(new[] { "Kota", "Kecamatan", "Kelurahan" }.Contains(controller) ? "open" : "")>
+                <details @(module == "Wilayah" && new[] { "Kota", "Kecamatan", "Kelurahan" }.Contains(controller) ? "open" : "")>
                     <summary>
                         <i class="ph ph-map-trifold me-2 text-lg"></i>
                         Wilayah
                     </summary>
                     <ul>
-                        <li><a asp-controller="Kota" class="@(controller == "Kota" ? "menu-active" : "")">Kota</a></li>
-                        <li><a asp-controller="Kecamatan" class="@(controller == "Kecamatan" ? "menu-active" : "")">Kecamatan</a></li>
-                        <li><a asp-controller="Kelurahan" class="@(controller == "Kelurahan" ? "menu-active" : "")">Kelurahan</a></li>
+                        <li><a asp-controller="Kota" class="@(module == "Wilayah" && controller == "Kota" ? "menu-active" : "")">Kota</a></li>
+                        <li><a asp-controller="Kecamatan" class="@(module == "Wilayah" && controller == "Kecamatan" ? "menu-active" : "")">Kecamatan</a></li>
+                        <li><a asp-controller="Kelurahan" class="@(module == "Wilayah" && controller == "Kelurahan" ? "menu-active" : "")">Kelurahan</a></li>
                     </ul>
                 </details>
             </li>
 
             <!-- Master Data -->
             <li>
-                <details @(new[] { "Aktivitas", "Artikel", "Pendamping","BadanHukum", "Fasilitas", "JenisBankSampah", "JenisNasabah", "JenisPengolahan", "Kategori", "KategoriFasilitas", "Mitra", "StatusLahan", "JenisSampah", "KategoriSampah", "SubKategoriSampah", "Lokasi" }.Contains(controller) ? "open" : "")>
+                <details @(module == "Master" && new[] { "Aktivitas", "Artikel", "Pendamping","BadanHukum", "Fasilitas", "JenisBankSampah", "JenisNasabah", "JenisPengolahan", "Kategori", "KategoriFasilitas", "Mitra", "StatusLahan", "JenisSampah", "KategoriSampah", "SubKategoriSampah", "Lokasi" }.Contains(controller) ? "open" : "")>
                     <summary>
                         <i class="ph ph-database me-2 text-lg"></i>
                         Master Data
                     </summary>
                     <ul>
-                        <li><a href="/Master/Pendamping/Index" class="@(controller == "Pendamping" ? "menu-active" : "")">Pendamping</a></li>
-                        <li><a href="/Master/Aktivitas/Index" class="@(controller == "Aktivitas" ? "menu-active" : "")">Aktivitas</a></li>
-                        <li><a href="/Master/Artikel/Index" class="@(controller == "Artikel" ? "menu-active" : "")">Artikel</a></li>
-                        <li><a href="/Master/BadanHukum/Index" class="@(controller == "BadanHukum" ? "menu-active" : "")">Badan Hukum</a></li>
-                        <li><a href="/Master/Fasilitas/Index" class="@(controller == "Fasilitas" ? "menu-active" : "")">Fasilitas</a></li>
-                        <li><a href="/Master/JenisBankSampah/Index" class="@(controller == "JenisBankSampah" ? "menu-active" : "")">Jenis Bank Sampah</a></li>
-                        <li><a href="/Master/JenisNasabah/Index" class="@(controller == "JenisNasabah" ? "menu-active" : "")">Jenis Nasabah</a></li>
-                        <li><a href="/Master/JenisPengolahan/Index" class="@(controller == "JenisPengolahan" ? "menu-active" : "")">Jenis Pengolahan</a></li>
-                        <li><a href="/Master/Kategori/Index" class="@(controller == "Kategori" ? "menu-active" : "")">Kategori</a></li>
-                        <li><a href="/Master/KategoriFasilitas/Index" class="@(controller == "KategoriFasilitas" ? "menu-active" : "")">Kategori Fasilitas</a></li>
-                        <li><a href="/Master/Mitra/Index" class="@(controller == "Mitra" ? "menu-active" : "")">Mitra</a></li>
-                        <li><a href="/Master/StatusLahan/Index" class="@(controller == "StatusLahan" ? "menu-active" : "")">Status Lahan</a></li>
-                        <li><a href="/Master/JenisSampah/Index" class="@(controller == "JenisSampah" ? "menu-active" : "")">Jenis Sampah</a></li>
-                        <li><a href="/Master/KategoriSampah/Index" class="@(controller == "KategoriSampah" ? "menu-active" : "")">Kategori Sampah</a></li>
-                        <li><a href="/Master/SubKategoriSampah/Index" class="@(controller == "SubKategoriSampah" ? "menu-active" : "")">Sub Kategori Sampah</a></li>
-                        <li><a href="/Master/Lokasi/Index" class="@(controller == "Lokasi" ? "menu-active" : "")">Lokasi</a></li>
+                        <li><a href="/Master/Pendamping/Index" class="@(module == "Master" && controller == "Pendamping" ? "menu-active" : "")">Pendamping</a></li>
+                        <li><a href="/Master/Aktivitas/Index" class="@(module == "Master" && controller == "Aktivitas" ? "menu-active" : "")">Aktivitas</a></li>
+                        <li><a href="/Master/Artikel/Index" class="@(module == "Master" && controller == "Artikel" ? "menu-active" : "")">Artikel</a></li>
+                        <li><a href="/Master/BadanHukum/Index" class="@(module == "Master" && controller == "BadanHukum" ? "menu-active" : "")">Badan Hukum</a></li>
+                        <li><a href="/Master/Fasilitas/Index" class="@(module == "Master" && controller == "Fasilitas" ? "menu-active" : "")">Fasilitas</a></li>
+                        <li><a href="/Master/JenisBankSampah/Index" class="@(module == "Master" && controller == "JenisBankSampah" ? "menu-active" : "")">Jenis Bank Sampah</a></li>
+                        <li><a href="/Master/JenisNasabah/Index" class="@(module == "Master" && controller == "JenisNasabah" ? "menu-active" : "")">Jenis Nasabah</a></li>
+                        <li><a href="/Master/JenisPengolahan/Index" class="@(module == "Master" && controller == "JenisPengolahan" ? "menu-active" : "")">Jenis Pengolahan</a></li>
+                        <li><a href="/Master/Kategori/Index" class="@(module == "Master" && controller == "Kategori" ? "menu-active" : "")">Kategori</a></li>
+                        <li><a href="/Master/KategoriFasilitas/Index" class="@(module == "Master" && controller == "KategoriFasilitas" ? "menu-active" : "")">Kategori Fasilitas</a></li>
+                        <li><a href="/Master/Mitra/Index" class="@(module == "Master" && controller == "Mitra" ? "menu-active" : "")">Mitra</a></li>
+                        <li><a href="/Master/StatusLahan/Index" class="@(module == "Master" && controller == "StatusLahan" ? "menu-active" : "")">Status Lahan</a></li>
+                        <li><a href="/Master/JenisSampah/Index" class="@(module == "Master" && controller == "JenisSampah" ? "menu-active" : "")">Jenis Sampah</a></li>
+                        <li><a href="/Master/KategoriSampah/Index" class="@(module == "Master" && controller == "KategoriSampah" ? "menu-active" : "")">Kategori Sampah</a></li>
+                        <li><a href="/Master/SubKategoriSampah/Index" class="@(module == "Master" && controller == "SubKategoriSampah" ? "menu-active" : "")">Sub Kategori Sampah</a></li>
+                        <li><a href="/Master/Lokasi/Index" class="@(module == "Master" && controller == "Lokasi" ? "menu-active" : "")">Lokasi</a></li>
                     </ul>
                 </details>
             </li>