diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue
index 23a28de..a0bbb6a 100755
--- a/src/components/Form/FiltersType/Type2.vue
+++ b/src/components/Form/FiltersType/Type2.vue
@@ -104,48 +104,25 @@ onMounted(() => {
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
     <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Regional:</label>
 
-    <Select
-      @update:selected="setRegional($event)"
-      :data="itemsRegional"
-      :placeholder="regionalPlaceholder"
-    />
+    <Select @update:selected="setRegional($event)" :data="itemsRegional" :placeholder="regionalPlaceholder" />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select
-      @update:selected="setUid($event)"
-      :data="itemsUid"
-      :selected="uid"
-      :placeholder="uidPlaceholder"
-    />
+    <Select @update:selected="setUid($event)" :data="itemsUid" :selected="uid" :placeholder="uidPlaceholder" />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :selected="uppp"
-      :data="itemsUp3"
-      :placeholder="up3Placholder"
-    />
+    <Select @update:selected="setUp3($event)" :selected="uppp" :data="itemsUp3" :placeholder="up3Placholder" />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
     <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Unit Layanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUlp($event)"
-      :data="itemsUlp"
-      :selected="ulp"
-      :placeholder="ulpPlaceholder"
-    />
+    <Select @update:selected="setUlp($event)" :data="itemsUlp" :selected="ulp" :placeholder="ulpPlaceholder" />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
diff --git a/src/components/Pages/Monalisa/Table_37.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
similarity index 98%
rename from src/components/Pages/Monalisa/Table_37.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
index 270f519..94575fb 100755
--- a/src/components/Pages/Monalisa/Table_37.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
@@ -169,14 +169,14 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaDispatchingTime
 })
 
 const filterData = (params: any) => {
-  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     // regional: regional,
-    idUid: idUid ? idUid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
     bulan: bulan ? bulan.id : bulanSekarang.value,
     tahun: bulan ? tahun.id : tahunSekarang.value
diff --git a/src/components/Pages/Monalisa/Table_43.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_43.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
diff --git a/src/components/Pages/Monalisa/Table_44.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_44.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
diff --git a/src/components/Pages/Monalisa/Table_41.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_41.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
diff --git a/src/components/Pages/Monalisa/Table_40.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_40.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
diff --git a/src/components/Pages/Monalisa/Table_36.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
similarity index 98%
rename from src/components/Pages/Monalisa/Table_36.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
index e8c42ca..ea62a00 100755
--- a/src/components/Pages/Monalisa/Table_36.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue
@@ -196,14 +196,14 @@ const { onResult, onError, loading, refetch } = useQuery(MONALISAJUMLAHKALIGANGG
 })
 
 const filterData = (params: any) => {
-  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     // regional: regional,
-    idUid: idUid ? idUid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
     bulan: bulan ? bulan.id : bulanSekarang.value,
     tahun: bulan ? tahun.id : tahunSekarang.value
diff --git a/src/components/Pages/Monalisa/Table_42.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_42.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
diff --git a/src/components/Pages/Monalisa/Table_38.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
similarity index 98%
rename from src/components/Pages/Monalisa/Table_38.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
index 0937c05..c7e61f8 100755
--- a/src/components/Pages/Monalisa/Table_38.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
@@ -140,14 +140,14 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRecoveryTimeGan
 })
 
 const filterData = (params: any) => {
-  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     // regional: regional,
-    idUid: idUid ? idUid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
     bulan: bulan ? bulan.id : bulanSekarang.value,
     tahun: bulan ? tahun.id : tahunSekarang.value
diff --git a/src/components/Pages/Monalisa/Table_39.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
similarity index 98%
rename from src/components/Pages/Monalisa/Table_39.vue
rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
index 17dfca1..d595a5e 100755
--- a/src/components/Pages/Monalisa/Table_39.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
@@ -140,14 +140,14 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaResponseTimeKel
 })
 
 const filterData = (params: any) => {
-  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     // regional: regional,
-    idUid: idUid ? idUid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
     bulan: bulan ? bulan.id : bulanSekarang.value,
     tahun: bulan ? tahun.id : tahunSekarang.value
diff --git a/src/components/Pages/Monalisa/Table_49.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_49.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue
diff --git a/src/components/Pages/Monalisa/Table_48.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_48.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue
diff --git a/src/components/Pages/Monalisa/Table_45.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_45.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue
diff --git a/src/components/Pages/Monalisa/Table_51.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_51.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue
diff --git a/src/components/Pages/Monalisa/Table_50.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_LaporUlangKeluhan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_50.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_LaporUlangKeluhan.vue
diff --git a/src/components/Pages/Monalisa/Table_46.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_46.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue
diff --git a/src/components/Pages/Monalisa/Table_47.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_47.vue
rename to src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue
diff --git a/src/components/Pages/Monalisa/Table_53.vue b/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_53.vue
rename to src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue
diff --git a/src/components/Pages/Monalisa/Table_54.vue b/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_EnergyNotSales.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_54.vue
rename to src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_EnergyNotSales.vue
diff --git a/src/components/Pages/Monalisa/Table_55.vue b/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_KADDalamPelaporan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_55.vue
rename to src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_KADDalamPelaporan.vue
diff --git a/src/components/Pages/Monalisa/Table_52.vue b/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_PenurunanJumlahKomplain.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_52.vue
rename to src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_PenurunanJumlahKomplain.vue
diff --git a/src/components/Pages/Monalisa/Table_57.vue b/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_AgingComplaint.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_57.vue
rename to src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_AgingComplaint.vue
diff --git a/src/components/Pages/Monalisa/Table_58.vue b/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_EnergyNotSales.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_58.vue
rename to src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_EnergyNotSales.vue
diff --git a/src/components/Pages/Monalisa/Table_59.vue b/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_59.vue
rename to src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.vue
diff --git a/src/components/Pages/Monalisa/Table_56.vue b/src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_PenurunanJumlahKomplain.vue
similarity index 100%
rename from src/components/Pages/Monalisa/Table_56.vue
rename to src/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_PenurunanJumlahKomplain.vue
diff --git a/src/components/Pages/Monalisa/index.ts b/src/components/Pages/Monalisa/index.ts
index 4142a1c..dd6dfca 100755
--- a/src/components/Pages/Monalisa/index.ts
+++ b/src/components/Pages/Monalisa/index.ts
@@ -1,24 +1,27 @@
-export { default as MonalisaTable1 } from '@/components/Pages/Monalisa/Table_36.vue'
-export { default as MonalisaTable2 } from '@/components/Pages/Monalisa/Table_37.vue'
-export { default as MonalisaTable3 } from '@/components/Pages/Monalisa/Table_38.vue'
-export { default as MonalisaTable4 } from '@/components/Pages/Monalisa/Table_39.vue'
-export { default as MonalisaTable5 } from '@/components/Pages/Monalisa/Table_40.vue'
-export { default as MonalisaTable6 } from '@/components/Pages/Monalisa/Table_41.vue'
-export { default as MonalisaTable7 } from '@/components/Pages/Monalisa/Table_42.vue'
-export { default as MonalisaTable8 } from '@/components/Pages/Monalisa/Table_43.vue'
-export { default as MonalisaTable9 } from '@/components/Pages/Monalisa/Table_44.vue'
-export { default as MonalisaTable10 } from '@/components/Pages/Monalisa/Table_45.vue'
-export { default as MonalisaTable11 } from '@/components/Pages/Monalisa/Table_46.vue'
-export { default as MonalisaTable12 } from '@/components/Pages/Monalisa/Table_47.vue'
-export { default as MonalisaTable13 } from '@/components/Pages/Monalisa/Table_48.vue'
-export { default as MonalisaTable14 } from '@/components/Pages/Monalisa/Table_49.vue'
-export { default as MonalisaTable15 } from '@/components/Pages/Monalisa/Table_50.vue'
-export { default as MonalisaTable16 } from '@/components/Pages/Monalisa/Table_51.vue'
-export { default as MonalisaTable17 } from '@/components/Pages/Monalisa/Table_52.vue'
-export { default as MonalisaTable18 } from '@/components/Pages/Monalisa/Table_53.vue'
-export { default as MonalisaTable19 } from '@/components/Pages/Monalisa/Table_54.vue'
-export { default as MonalisaTable20 } from '@/components/Pages/Monalisa/Table_55.vue'
-export { default as MonalisaTable21 } from '@/components/Pages/Monalisa/Table_56.vue'
-export { default as MonalisaTable22 } from '@/components/Pages/Monalisa/Table_57.vue'
-export { default as MonalisaTable23 } from '@/components/Pages/Monalisa/Table_58.vue'
-export { default as MonalisaTable24 } from '@/components/Pages/Monalisa/Table_59.vue'
+export { default as MonalisaGRJumlahKaliGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue'
+export { default as MonalisaGRDispatchingTimeGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue'
+export { default as MonalisaGRRecoveryTimeGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue'
+export { default as MonalisaGRResponseTimeGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue'
+export { default as MonalisaGRJumlahDDRPTRCTGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue'
+export { default as MonalisaGRGangguanPerJenisGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue'
+export { default as MonalisaGRLaporUlang } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue'
+export { default as MonalisaGRENSGangguan } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue'
+export { default as MonalisaGRGangguanBelumSelesai } from '@/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue'
+
+export { default as MonalisaKRJumlahKaliKeluhan } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahKaliKeluhan.vue'
+export { default as MonalisaKRRecoveryTimeKeluhan } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_RecoveryTimeKeluhan.vue'
+export { default as MonalisaKRResponseTimeKeluhan } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_ResponseTimeKeluhan.vue'
+export { default as MonalisaKRJumlahDDRPTRCTKeluhan } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_JumlahDDRPTRCTKeluhan.vue'
+export { default as MonalisaKRGangguanPerJenisKeluhan } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_GangguanPerJenisKeluhan.vue'
+export { default as MonalisaKRLaporUlangKeluhan } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_LaporUlangKeluhan.vue'
+export { default as MonalisaKRKeluhanBelumSelesai } from '@/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue'
+
+export { default as MonalisaLBPenurunanJumlahKomplain } from '@/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_PenurunanJumlahKomplain.vue'
+export { default as MonalisaLBAgingComplaint } from '@/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue'
+export { default as MonalisaLBEnergyNotSales } from '@/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_EnergyNotSales.vue'
+export { default as MonalisaLBKADDalamPelaporan } from '@/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_KADDalamPelaporan.vue'
+
+export { default as MonalisaLKPenurunanJumlahKomplain } from '@/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_PenurunanJumlahKomplain.vue'
+export { default as MonalisaLKAgingComplaint } from '@/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_AgingComplaint.vue'
+export { default as MonalisaLKEnergyNotSales } from '@/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_EnergyNotSales.vue'
+export { default as MonalisaLKKDADPelaporan } from '@/components/Pages/Monalisa/Laporan/Kumulatif/MonalisaLK_KDADPelaporan.vue'
diff --git a/src/router/index.ts b/src/router/index.ts
index 28decb4..74e82f7 100755
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -46,30 +46,30 @@ import {
   RekapKeluhanRatingPerUnit
 } from '@/components/Pages/Keluhan'
 import {
-  MonalisaTable1,
-  MonalisaTable10,
-  MonalisaTable11,
-  MonalisaTable12,
-  MonalisaTable13,
-  MonalisaTable14,
-  MonalisaTable15,
-  MonalisaTable16,
-  MonalisaTable17,
-  MonalisaTable18,
-  MonalisaTable19,
-  MonalisaTable2,
-  MonalisaTable20,
-  MonalisaTable21,
-  MonalisaTable22,
-  MonalisaTable23,
-  MonalisaTable24,
-  MonalisaTable3,
-  MonalisaTable4,
-  MonalisaTable5,
-  MonalisaTable6,
-  MonalisaTable7,
-  MonalisaTable8,
-  MonalisaTable9
+  MonalisaGRDispatchingTimeGangguan,
+  MonalisaLBKADDalamPelaporan,
+  MonalisaLKPenurunanJumlahKomplain,
+  MonalisaLKAgingComplaint,
+  MonalisaLKEnergyNotSales,
+  MonalisaLKKDADPelaporan,
+  MonalisaGRRecoveryTimeGangguan,
+  MonalisaGRResponseTimeGangguan,
+  MonalisaGRJumlahDDRPTRCTGangguan,
+  MonalisaGRGangguanPerJenisGangguan,
+  MonalisaGRLaporUlang,
+  MonalisaGRENSGangguan,
+  MonalisaGRGangguanBelumSelesai,
+  MonalisaGRJumlahKaliGangguan,
+  MonalisaLBEnergyNotSales,
+  MonalisaLBAgingComplaint,
+  MonalisaLBPenurunanJumlahKomplain,
+  MonalisaKRKeluhanBelumSelesai,
+  MonalisaKRLaporUlangKeluhan,
+  MonalisaKRGangguanPerJenisKeluhan,
+  MonalisaKRJumlahDDRPTRCTKeluhan,
+  MonalisaKRResponseTimeKeluhan,
+  MonalisaKRRecoveryTimeKeluhan,
+  MonalisaKRJumlahKaliKeluhan
 } from '@/components/Pages/Monalisa'
 import { LaporanCICO } from '@/components/Pages/Cico'
 import { Anomali_LAPPGU, Anomali_LAPPKU, Anomali_LAPPGP } from '@/components/Pages/Anomali'
@@ -338,48 +338,48 @@ export const routes: RouteRecordRaw[] = [
                 children: [
                   {
                     path: '1',
-                    name: 'Jumlah Kali  Gangguan',
-                    component: MonalisaTable1
+                    name: 'Jumlah Kali Gangguan',
+                    component: MonalisaGRJumlahKaliGangguan
                   },
                   {
                     path: '2',
                     name: 'Dispacthing Time (DT) Gangguan',
-                    component: MonalisaTable2
+                    component: MonalisaGRDispatchingTimeGangguan
                   },
                   {
                     path: '3',
                     name: 'Recovery Time (RCT) Gangguan',
-                    component: MonalisaTable3
+                    component: MonalisaGRRecoveryTimeGangguan
                   },
                   {
                     path: '4',
                     name: 'Response Time (RPT) Gangguan',
-                    component: MonalisaTable4
+                    component: MonalisaGRResponseTimeGangguan
                   },
                   {
                     path: '5',
                     name: 'Jumlah dan Durasi RPT RCT Gangguan',
-                    component: MonalisaTable5
+                    component: MonalisaGRJumlahDDRPTRCTGangguan
                   },
                   {
                     path: '6',
                     name: 'Rekapitulasi Gangguan Per Jenis Gangguan',
-                    component: MonalisaTable6
+                    component: MonalisaGRGangguanPerJenisGangguan
                   },
                   {
                     path: '7',
                     name: 'Rekapitulasi Lapor Ulang Gangguan',
-                    component: MonalisaTable7
+                    component: MonalisaGRLaporUlang
                   },
                   {
                     path: '8',
                     name: 'Rekapitulasi ENS Gangguan',
-                    component: MonalisaTable8
+                    component: MonalisaGRENSGangguan
                   },
                   {
                     path: '9',
                     name: 'Rekapitulasi Gangguan Belum Selesai',
-                    component: MonalisaTable9
+                    component: MonalisaGRGangguanBelumSelesai
                   },
                   {
                     path: ':pathMatch(.*)*',
@@ -404,37 +404,37 @@ export const routes: RouteRecordRaw[] = [
                   {
                     path: '1',
                     name: 'Jumlah Kali Keluhan',
-                    component: MonalisaTable10
+                    component: MonalisaKRJumlahKaliKeluhan
                   },
                   {
                     path: '2',
                     name: 'Recovery Time (RCT) Keluhan',
-                    component: MonalisaTable11
+                    component: MonalisaKRRecoveryTimeKeluhan
                   },
                   {
                     path: '3',
                     name: 'Response Time (RPT) Keluhan',
-                    component: MonalisaTable12
+                    component: MonalisaKRResponseTimeKeluhan
                   },
                   {
                     path: '4',
                     name: 'Jumlah dan Durasi RPT RCT Keluhan',
-                    component: MonalisaTable13
+                    component: MonalisaKRJumlahDDRPTRCTKeluhan
                   },
                   {
                     path: '5',
                     name: 'Rekapitulasi Gangguan Per Jenis Keluhan',
-                    component: MonalisaTable14
+                    component: MonalisaKRGangguanPerJenisKeluhan
                   },
                   {
                     path: '6',
                     name: 'Rekapitulasi Lapor Ulang Keluhan',
-                    component: MonalisaTable15
+                    component: MonalisaKRLaporUlangKeluhan
                   },
                   {
                     path: '7',
                     name: 'Rekapitulasi Keluhan Belum Selesai',
-                    component: MonalisaTable16
+                    component: MonalisaKRKeluhanBelumSelesai
                   },
                   {
                     path: ':pathMatch(.*)*',
@@ -459,22 +459,22 @@ export const routes: RouteRecordRaw[] = [
                   {
                     path: '1',
                     name: '(Monalisa) Penurunan Jumlah Komplain',
-                    component: MonalisaTable17
+                    component: MonalisaLBPenurunanJumlahKomplain
                   },
                   {
                     path: '2',
                     name: '(Monalisa) Aging Complaint',
-                    component: MonalisaTable18
+                    component: MonalisaLBAgingComplaint
                   },
                   {
                     path: '3',
                     name: '(Monalisa) Energy Not Sales (ENS)',
-                    component: MonalisaTable19
+                    component: MonalisaLBEnergyNotSales
                   },
                   {
                     path: '4',
                     name: '(Monalisa) Kepatuhan dan Akurasi Dalam Pelaporan',
-                    component: MonalisaTable20
+                    component: MonalisaLBKADDalamPelaporan
                   },
                   {
                     path: ':pathMatch(.*)*',
@@ -489,22 +489,22 @@ export const routes: RouteRecordRaw[] = [
                   {
                     path: '1',
                     name: 'Penurunan Jumlah Komplain',
-                    component: MonalisaTable21
+                    component: MonalisaLKPenurunanJumlahKomplain
                   },
                   {
                     path: '2',
                     name: 'Aging Complaint',
-                    component: MonalisaTable22
+                    component: MonalisaLKAgingComplaint
                   },
                   {
                     path: '3',
                     name: 'Energy Not Sales (ENS)',
-                    component: MonalisaTable23
+                    component: MonalisaLKEnergyNotSales
                   },
                   {
                     path: '4',
-                    name: 'Kepatuhan dan Akurasi  Dalam Pelaporan',
-                    component: MonalisaTable24
+                    name: 'Kepatuhan dan Akurasi Dalam Pelaporan',
+                    component: MonalisaLKKDADPelaporan
                   },
                   {
                     path: ':pathMatch(.*)*',