diff --git a/src/components/Form/FiltersType/Type10.vue b/src/components/Form/FiltersType/Type10.vue
index 96f5a6c..90f8ff4 100755
--- a/src/components/Form/FiltersType/Type10.vue
+++ b/src/components/Form/FiltersType/Type10.vue
@@ -55,51 +55,40 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :selected="up3"
-      :placeholder="up3Placeholder"
-    />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Layanan Pelanggan:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUlp($event)"
-      :data="itemsUlp"
-      :selected="ulp"
-      :placeholder="ulpPlaceholder"
-    />
-  </div>
+      <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">
-    <label class="filter-input-label">Periode Tanggal:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Lapor Ulang:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Lapor Ulang:</label>
 
-    <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
-      <InputNumber @update:time-value="(value) => (data.minJmlLapor = value)" />
-      <small class="flex items-center">s/d</small>
-      <InputNumber @update:time-value="(value) => (data.maxJmlLapor = value)" />
+      <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
+        <InputNumber @update:time-value="(value) => (data.minJmlLapor = value)" />
+        <small class="flex items-center">s/d</small>
+        <InputNumber @update:time-value="(value) => (data.maxJmlLapor = value)" />
+      </div>
     </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type11.vue b/src/components/Form/FiltersType/Type11.vue
index da9e144..cc4ca4f 100755
--- a/src/components/Form/FiltersType/Type11.vue
+++ b/src/components/Form/FiltersType/Type11.vue
@@ -102,40 +102,43 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Layanan Pelanggan:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
 
-    <Select @update:selected="setUlp($event)" :data="itemsUlp" :placeholder="ulpPlaceholder" :selected="ulp" />
-  </div>
+      <Select @update:selected="setUlp($event)" :data="itemsUlp" :placeholder="ulpPlaceholder" :selected="ulp" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Durasi:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Durasi:</label>
 
-    <div class="flex flex-col gap-y-1">
-      <Select @update:selected="changeDuration($event)" :data="sla" placeholder="Durasi Menit" />
-      <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
-        <InputWithSuffix :value="`${data.minTime} Menit`" />
-        <small class="flex items-center">s/d</small>
-        <InputWithSuffix :value="`${data.maxTime} Menit`" />
+      <div class="flex flex-col gap-y-1">
+        <Select @update:selected="changeDuration($event)" :data="sla" placeholder="Durasi Menit" />
+        <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
+          <InputWithSuffix :value="`${data.minTime} Menit`" />
+          <small class="flex items-center">s/d</small>
+          <InputWithSuffix :value="`${data.maxTime} Menit`" />
+        </div>
       </div>
     </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type12.vue b/src/components/Form/FiltersType/Type12.vue
index a4cf988..fc052e2 100755
--- a/src/components/Form/FiltersType/Type12.vue
+++ b/src/components/Form/FiltersType/Type12.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import Select from '@/components/Select.vue';
+import Select from '@/components/Select.vue';
 import DatePicker from '@/components/DatePicker.vue';
 import InputWithSuffix from '../InputWithSuffix.vue';
 import { selectedUid, selectedUp3Ulp, selectedUlp, fetchUid, itemsUid, itemsUp3, itemsUlp } from './reference';
@@ -79,69 +79,46 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select
-      @update:selected="setUid($event)"
-      :data="itemsUid"
-      :placeholder="uidPlaceholder"
-    />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :placeholder="up3Placeholder"
-    />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Layanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUlp($event)"
-      :data="itemsUlp"
-      :placeholder="ulpPlaceholder"
-    />
-  </div>
-  
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+      <Select @update:selected="setUlp($event)" :data="itemsUlp" :placeholder="ulpPlaceholder" />
+    </div>
 
-     <DatePicker @update:date-value="(value) => data.periode = value" />
-  </div>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Durasi:</label>
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
 
-    <div class="flex flex-col gap-y-1">
-      <Select 
-        @update:selected="changeDuration($event)" 
-        :data="sla" 
-        placeholder="Durasi Menit"
-      />
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Durasi:</label>
 
-      <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
-        <InputWithSuffix 
-          @update:minute-value="
-          (value :any)=> data.minDurasiResponseTime =value"
-        @value="data.minDurasiResponseTime"
-        :disabled=triggerInput />
-        <small class="flex items-center">s/d</small>
-        <InputWithSuffix 
-          @update:minute-value="
-          (value :any)=> data.maxDurasiResponseTime = value"
-        @value="data.maxDurasiResponseTime"
-        :disabled="triggerInput" />
+      <div class="flex flex-col gap-y-1">
+        <Select @update:selected="changeDuration($event)" :data="sla" placeholder="Durasi Menit" />
+
+        <div class="flex flex-1 justify-between gap-x-1.5">
+          <InputWithSuffix @update:minute-value="(value: any) => data.minDurasiResponseTime = value" @value="data.minDurasiResponseTime" :disabled=triggerInput
+            class="flex flex-1" />
+          <small class="flex items-center">s/d</small>
+          <InputWithSuffix @update:minute-value="(value: any) => data.maxDurasiResponseTime = value" @value="data.maxDurasiResponseTime"
+            :disabled="triggerInput" class="flex flex-1" />
+        </div>
       </div>
     </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type13.vue b/src/components/Form/FiltersType/Type13.vue
index be661f1..50c0401 100755
--- a/src/components/Form/FiltersType/Type13.vue
+++ b/src/components/Form/FiltersType/Type13.vue
@@ -57,53 +57,37 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :selected="up3"
-      :placeholder="up3Placeholder"
-    />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Layanan Pelanggan:</label>
-    <Select
-      @update:selected="setUlp($event)"
-      :data="itemsUlp"
-      :selected="ulp"
-      :placeholder="ulpPlaceholder"
-    />
-  </div>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
+      <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">
-    <label class="filter-input-label">Periode Tanggal:</label>
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Group By Kode Unit Distribusi:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Group By Kode Unit Distribusi:</label>
 
-    <InlineRadioGroup
-      @update:group-value="(value) => (data.groupBy = value.id === 2)"
-      :radio-items="[
+      <InlineRadioGroup @update:group-value="(value) => (data.groupBy = value.id === 2)" :radio-items="[
         { id: 1, title: 'Tidak' },
         { id: 2, title: 'Ya, Grupkan' }
-      ]"
-    />
+      ]" />
+    </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type14.vue b/src/components/Form/FiltersType/Type14.vue
index 953fe6e..1840bbf 100755
--- a/src/components/Form/FiltersType/Type14.vue
+++ b/src/components/Form/FiltersType/Type14.vue
@@ -43,26 +43,30 @@ onMounted(() => {
 
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Distribusi/Wilayah:</label>
-    <Select :data="itemsUid" @update:selected="setUid($event)" :placeholder="uidPlaceholder" :selected="uid" />
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Distribusi/Wilayah:</label>
+      <Select :data="itemsUid" @update:selected="setUid($event)" :placeholder="uidPlaceholder" :selected="uid" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Area:</label>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
+      <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko"
+        :placeholder="poskoPlaceholder" />
+
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Area:</label>
-    <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
-
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
-    <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko" :placeholder="poskoPlaceholder" />
-
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
-
-    <DatePicker @update:date-value="(value) => data.periode = value" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type15.vue b/src/components/Form/FiltersType/Type15.vue
index f640428..b93c35d 100755
--- a/src/components/Form/FiltersType/Type15.vue
+++ b/src/components/Form/FiltersType/Type15.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-  import InputWithFilter from '../InputWithFilter.vue';
+import InputWithFilter from '../InputWithFilter.vue';
 import DatePicker from '@/components/DatePicker.vue';
 import InlineRadioGroup from '@/components/Form/InlineRadioGroup.vue';
 import { ref } from 'vue';
 const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah';
 const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan';
 const ulpPlaceholder = 'Semua Unit Layanan Pelanggan';
-  const uppp = ref({ id: 0, name: up3Placeholder });
+const uppp = ref({ id: 0, name: up3Placeholder });
 const uid = ref({ id: 0, name: uidPlaceholder });
 const ulp = ref({ id: 0, name: ulpPlaceholder });
 const emit = defineEmits(['update:filters'])
@@ -20,21 +20,24 @@ const data = ref({
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Jenis Pengaduan:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Jenis Pengaduan:</label>
 
-    <InlineRadioGroup :radio-items="[{id: 1, title: 'Gangguan', checked: true}, {id: 2, title: 'Keluhan'}]" />
+      <InlineRadioGroup :radio-items="[{ id: 1, title: 'Gangguan', checked: true }, { id: 2, title: 'Keluhan' }]" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Cari Report Number:</label>
+
+      <InputWithFilter placeholder="cari report" :filters="[{ id: 1, title: 'Nama Pelapor' }]" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Cari Report Number:</label>
-
-    <InputWithFilter placeholder="cari report" :filters="[{id: 1, title: 'Nama Pelapor'}]" />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
-
-     <DatePicker @update:date-value="(value) => data.periode = value" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type16.vue b/src/components/Form/FiltersType/Type16.vue
index 7fbdbc1..2f0f4e8 100755
--- a/src/components/Form/FiltersType/Type16.vue
+++ b/src/components/Form/FiltersType/Type16.vue
@@ -68,57 +68,38 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select
-      :data="itemsUid"
-      @update:selected="setUid($event)"
-      :placeholder="uidPlaceholder"
-      :selected="uid"
-    />
+      <Select :data="itemsUid" @update:selected="setUid($event)" :placeholder="uidPlaceholder" :selected="uid" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+
+      <Select :data="itemsUp3" @update:selected="setUp3($event)" :placeholder="up3Placeholder" :selected="up3" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
+
+      <Select :data="itemsPosko" @update:selected="setPosko($event)" :placeholder="poskoPlaceholder"
+        :selected="posko" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Media:</label>
+
+      <Select :selected="media" @update:selected="setMedia($event)" :placeholder="mediaPlaceholder"
+        :data="itemsMedia" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
-
-    <Select
-      :data="itemsUp3"
-      @update:selected="setUp3($event)"
-      :placeholder="up3Placeholder"
-      :selected="up3"
-    />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
-
-    <Select
-      :data="itemsPosko"
-      @update:selected="setPosko($event)"
-      :placeholder="poskoPlaceholder"
-      :selected="posko"
-    />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Media:</label>
-
-    <Select
-      :selected="media"
-      @update:selected="setMedia($event)"
-      :placeholder="mediaPlaceholder"
-      :data="itemsMedia"
-    />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
-
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type17.vue b/src/components/Form/FiltersType/Type17.vue
index 8bb8ba5..1784c06 100755
--- a/src/components/Form/FiltersType/Type17.vue
+++ b/src/components/Form/FiltersType/Type17.vue
@@ -1,50 +1,51 @@
 <script setup lang="ts">
-  import Select from '@/components/Select.vue';
+import Select from '@/components/Select.vue';
 import DatePicker from '@/components/DatePicker.vue';
 import InputWithFilter from '../InputWithFilter.vue';
 import { ref } from 'vue';
-  const data = ref({
-    periode: '',
-  })
+const data = ref({
+  periode: '',
+})
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-     <DatePicker @update:date-value="(value) => data.periode = value" />
-  </div>
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit PLN:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit PLN:</label>
 
-    <div class="flex flex-col gap-y-1">
-      <Select placeholder="Pilih Unit" />
+      <div class="flex flex-col gap-y-1">
+        <Select placeholder="Pilih Unit" />
 
-      <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
-        <Select placeholder="Pilih Area" />
-        <Select placeholder="Pilih Rayon" />
+        <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
+          <Select placeholder="Pilih Area" />
+          <Select placeholder="Pilih Rayon" />
+        </div>
       </div>
     </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Status:</label>
+
+      <Select placeholder="Pilih Status" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">SLA:</label>
+
+      <Select placeholder="Pilih Durasi SLA" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Pencarian:</label>
+
+      <InputWithFilter placeholder="cari report" :filters="[{ id: 1, title: 'Pilih Jenis' }]" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Status:</label>
-
-    <Select placeholder="Pilih Status"/>
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >SLA:</label
-    >
-
-    <Select placeholder="Pilih Durasi SLA" />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Pencarian:</label>
-
-    <InputWithFilter placeholder="cari report" :filters="[{id: 1, title: 'Pilih Jenis'}]" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type18.vue b/src/components/Form/FiltersType/Type18.vue
index 05f5fe1..d1a0a8e 100755
--- a/src/components/Form/FiltersType/Type18.vue
+++ b/src/components/Form/FiltersType/Type18.vue
@@ -14,12 +14,12 @@ const uid = ref({ id: 0, name: uidPlaceholder });
 const posko = ref({ id: 0, name: poskoPlaceholder });
 const emit = defineEmits(['update:filters'])
 const jenisTransakasi = [
-    { id: 1, value: 'Koreksi Transaksi Individual',label: 'Koreksi Transaksi Individual' },
-    { id: 2, value: 'Cleansing Traksaksi TM',label: 'Cleansing Traksaksi TM',  }, 
-    { id: 3, value: 'Koreksi Transaksi TM',label: 'Koreksi Transaksi TM',  },  
-    { id: 4, value: 'Koreksi Kode Gangguan dan Anev',label: 'Koreksi Kode Gangguan dan Anev'  },
-  ]
-  const data = ref({
+  { id: 1, value: 'Koreksi Transaksi Individual', label: 'Koreksi Transaksi Individual' },
+  { id: 2, value: 'Cleansing Traksaksi TM', label: 'Cleansing Traksaksi TM', },
+  { id: 3, value: 'Koreksi Transaksi TM', label: 'Koreksi Transaksi TM', },
+  { id: 4, value: 'Koreksi Kode Gangguan dan Anev', label: 'Koreksi Kode Gangguan dan Anev' },
+]
+const data = ref({
   uid: uid.value,
   up3: up3.value,
   posko: posko.value,
@@ -34,35 +34,35 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="selectedUid($event)" :data="itemsUid" placeholder="Semua Unit Induk Distribusi/Wilayah" />
+      <Select @update:selected="selectedUid($event)" :data="itemsUid"
+        placeholder="Semua Unit Induk Distribusi/Wilayah" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+
+      <Select @update:selected="selectedUp3Posko($event)" :data="itemsUp3" :selected="up3"
+        placeholder="Semua Unit Pelaksanaan Pelayanan Pelanggan" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
+
+      <Select @update:selected="selectedPosko($event)" :data="itemsPosko" :selected="posko" placeholder="Semua Posko" />
+    </div>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Jenis Transaksi:</label>
+
+      <SelectMulti :tags="jenisTransakasi" placeholder="Semua Jenis Transaksi" useLabel label="Jenis Transaksi" />
+    </div>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
-
-    <Select @update:selected="selectedUp3Posko($event)" :data="itemsUp3" :selected="up3" placeholder="Semua Unit Pelaksanaan Pelayanan Pelanggan" />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
-
-    <Select @update:selected="selectedPosko($event)" :data="itemsPosko" :selected="posko" placeholder="Semua Posko" />
-  </div>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Jenis Transaksi:</label>
-
-    <SelectMulti 
-      :tags="jenisTransakasi" 
-      placeholder="Semua Jenis Transaksi" 
-      useLabel 
-      label="Jenis Transaksi"
-      />
-  </div>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
-    <DatePicker @update:date-value="(value) => data.periode = value" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue
index 1e49a54..ffbe362 100755
--- a/src/components/Form/FiltersType/Type2.vue
+++ b/src/components/Form/FiltersType/Type2.vue
@@ -99,36 +99,39 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Regional:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Regional:</label>
 
-    <Select @update:selected="setRegional($event)" :data="itemsRegional" :placeholder="regionalPlaceholder" />
-  </div>
+      <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="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :selected="uid" :placeholder="uidPlaceholder" />
-  </div>
+      <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="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select @update:selected="setUp3($event)" :selected="uppp" :data="itemsUp3" :placeholder="up3Placholder" />
-  </div>
+      <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="filter-input-label">Unit Layanan Pelanggan:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
 
-    <Select @update:selected="setUlp($event)" :data="itemsUlp" :selected="ulp" :placeholder="ulpPlaceholder" />
-  </div>
+      <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">
-    <label class="filter-input-label">Periode</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode</label>
 
-    <div class="grid grid-cols-2 gap-x-2">
-      <Select @update:selected="setMonth($event)" :data="months" :placeholder="bulanPlaceholder" />
-      <Select @update:selected="setYear($event)" :data="years" :placeholder="tahunPlaceholder" />
+      <div class="grid grid-cols-2 gap-x-2">
+        <Select @update:selected="setMonth($event)" :data="months" :placeholder="bulanPlaceholder" />
+        <Select @update:selected="setYear($event)" :data="years" :placeholder="tahunPlaceholder" />
+      </div>
     </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type3.vue b/src/components/Form/FiltersType/Type3.vue
index dee962c..21e9f7f 100755
--- a/src/components/Form/FiltersType/Type3.vue
+++ b/src/components/Form/FiltersType/Type3.vue
@@ -59,41 +59,30 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
+
+      <Select @update:selected="setUlp($event)" :data="itemsUlp" :selected="ulp" :placeholder="ulpPlaceholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
-
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :selected="up3"
-      :placeholder="up3Placeholder"
-    />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Layanan Pelanggan:</label>
-
-    <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">
-    <label class="filter-input-label">Periode Tanggal:</label>
-
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type4.vue b/src/components/Form/FiltersType/Type4.vue
index 12d42c4..3d50d35 100755
--- a/src/components/Form/FiltersType/Type4.vue
+++ b/src/components/Form/FiltersType/Type4.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-  import Select from '@/components/Select.vue';
+import Select from '@/components/Select.vue';
 import DatePicker from '@/components/DatePicker.vue';
 import { selectedUid, selectedUp3Ulp, selectedUlp, itemsUid, itemsUp3, itemsUlp } from './reference';
 import { onMounted, ref } from 'vue';
@@ -15,7 +15,7 @@ const data = ref({
   up3: uppp.value,
   ulp: ulp.value,
   periode: '',
-  jenisLaporan : ''
+  jenisLaporan: ''
 })
 const setUid = (value: any) => {
   uid.value = value;
@@ -43,59 +43,39 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select 
-      @update:selected="setUid($event)" 
-      :data="itemsUid" 
-      :placeholder="uidPlaceholder"
-    />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select 
-      @update:selected="setUp3($event)" 
-      :data="itemsUp3" 
-      :placeholder="up3Placeholder"
-     />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Layanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Layanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUlp($event)"
-      :data="itemsUlp"
-      :placeholder="ulpPlaceholder"
-    />
-  </div>
+      <Select @update:selected="setUlp($event)" :data="itemsUlp" :placeholder="ulpPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Jenis Laporan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Jenis Laporan:</label>
 
-    <Select
-      @update:selected="(value) => data.jenisLaporan = value"
-      :data="[
+      <Select @update:selected="(value) => data.jenisLaporan = value" :data="[
         { id: 1, name: 'Laporan Berulang Unit' },
         { id: 2, name: 'Laporan Berulang Pelanggan' },
         { id: 3, name: 'Laporan Berulang Pelanggan dan Unit' },
-      ]"
-      :placeholder="'Semua Jenis Laporan'"
-    />
-  </div>
+      ]" :placeholder="'Semua Jenis Laporan'" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-     <DatePicker @update:date-value="(value) => data.periode = value" />
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
   </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type5.vue b/src/components/Form/FiltersType/Type5.vue
index bd1847a..1e2a93c 100755
--- a/src/components/Form/FiltersType/Type5.vue
+++ b/src/components/Form/FiltersType/Type5.vue
@@ -57,30 +57,30 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select :data="itemsUid" @update:selected="setUid($event)" :placeholder="uidPlaceholder" :selected="uid" />
+      <Select :data="itemsUid" @update:selected="setUid($event)" :placeholder="uidPlaceholder" :selected="uid" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="uppp" :placeholder="uppPlaceholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
+
+      <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko"
+        :placeholder="poskoPlaceholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+      <DatePicker @update:date-value="(value) => data.periode = value" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
-
-    <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="uppp" :placeholder="uppPlaceholder" />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
-
-    <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko" :placeholder="poskoPlaceholder" />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
-    <DatePicker @update:date-value="(value) => data.periode = value" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type6.vue b/src/components/Form/FiltersType/Type6.vue
index b46d361..525d365 100755
--- a/src/components/Form/FiltersType/Type6.vue
+++ b/src/components/Form/FiltersType/Type6.vue
@@ -56,57 +56,43 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :selected="up3"
-      :placeholder="up3Placeholder"
-    />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
 
-    <Select
-      @update:selected="setPosko($event)"
-      :data="itemsPosko"
-      :selected="posko"
-      :placeholder="poskoPlaceholder"
-    />
-  </div>
+      <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko"
+        :placeholder="poskoPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Lapor Ulang:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Lapor Ulang:</label>
 
-    <div class="grid grid-flow-col auto-cols-auto gap-x-1.5">
-      <InputNumber
-        :value="data.minJmlLapor"
-        @update:time-value="(value) => (data.minJmlLapor = value)"
-      />
-      <small class="flex items-center">s/d</small>
-      <InputNumber
-        :value="data.maxJmlLapor"
-        @update:time-value="(value) => (data.maxJmlLapor = value)"
-      />
+      <div class="flex flex-1 justify-between gap-x-1.5">
+        <InputNumber :value="data.minJmlLapor" @update:time-value="(value) => (data.minJmlLapor = value)"
+          class="flex flex-1" />
+        <small class="flex items-center">s/d</small>
+        <InputNumber :value="data.maxJmlLapor" @update:time-value="(value) => (data.maxJmlLapor = value)"
+          class="flex flex-1" />
+      </div>
     </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type7.vue b/src/components/Form/FiltersType/Type7.vue
index 553f833..5b5dc5a 100755
--- a/src/components/Form/FiltersType/Type7.vue
+++ b/src/components/Form/FiltersType/Type7.vue
@@ -133,55 +133,45 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :selected="up3"
-      :placeholder="up3Placeholder"
-    />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="up3" :placeholder="up3Placeholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
 
-    <Select
-      @update:selected="setPosko($event)"
-      :data="itemsPosko"
-      :selected="posko"
-      :placeholder="poskoPlaceholder"
-    />
-  </div>
+      <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko"
+        :placeholder="poskoPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Durasi:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Durasi:</label>
 
-    <div class="flex flex-col gap-y-1">
-      <Select @update:selected="changeDuration($event)" :data="sla" placeholder="Durasi Menit" />
+      <div class="flex flex-col gap-y-1">
+        <Select @update:selected="changeDuration($event)" :data="sla" placeholder="Durasi Menit" />
 
-      <div class="grid grid-flow-col auto-cols-auto gap-x-1.5" :class="[isHidden ? 'hidden' : '']">
-        <InputWithSuffix :value="`${data.minTime} Menit`" @update:text="setMin($event)" />
-        <small class="flex items-center">s/d</small>
-        <InputWithSuffix :value="`${data.maxTime} Menit`" @update:text="setMax($event)" />
+        <div class="flex flex-1 justify-between gap-x-1.5" :class="[isHidden ? 'hidden' : '']">
+          <InputWithSuffix :value="`${data.minTime} Menit`" @update:text="setMin($event)" class="flex flex-1" />
+          <small class="flex items-center">s/d</small>
+          <InputWithSuffix :value="`${data.maxTime} Menit`" @update:text="setMax($event)" class="flex flex-1" />
+        </div>
       </div>
     </div>
   </div>
+
 </template>
diff --git a/src/components/Form/FiltersType/Type8.vue b/src/components/Form/FiltersType/Type8.vue
index e3aa084..937385d 100755
--- a/src/components/Form/FiltersType/Type8.vue
+++ b/src/components/Form/FiltersType/Type8.vue
@@ -42,30 +42,24 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :selected="uppp" :placeholder="uppPlaceholder" />
+    </div>
+
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
+
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
   </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
-
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :selected="uppp"
-      :placeholder="uppPlaceholder"
-    />
-  </div>
-
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
-
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type9.vue b/src/components/Form/FiltersType/Type9.vue
index ebaffee..c8af25f 100755
--- a/src/components/Form/FiltersType/Type9.vue
+++ b/src/components/Form/FiltersType/Type9.vue
@@ -60,55 +60,40 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Induk Distribusi/Wilayah:</label
-    >
+  <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Induk Distribusi/Wilayah:</label>
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
-  </div>
+      <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Unit Pelaksanaan Pelayanan Pelanggan:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Unit Pelaksanaan Pelayanan Pelanggan:</label>
 
-    <Select
-      @update:selected="setUp3($event)"
-      :data="itemsUp3"
-      :placeholder="uppPlaceholder"
-      :selected="uppp"
-    />
-  </div>
+      <Select @update:selected="setUp3($event)" :data="itemsUp3" :placeholder="uppPlaceholder" :selected="uppp" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Posko:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Posko:</label>
 
-    <Select
-      @update:selected="setPosko($event)"
-      :data="itemsPosko"
-      :placeholder="poskoPlaceholder"
-      :selected="posko"
-    />
-  </div>
+      <Select @update:selected="setPosko($event)" :data="itemsPosko" :placeholder="poskoPlaceholder"
+        :selected="posko" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label">Periode Tanggal:</label>
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Periode Tanggal:</label>
 
-    <DatePicker @update:date-value="(value) => (data.periode = value)" />
-  </div>
+      <DatePicker @update:date-value="(value) => (data.periode = value)" />
+    </div>
 
-  <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="filter-input-label"
-      >Group By Kode Unit Distribusi:</label
-    >
+    <div class="flex flex-col flex-1 space-y-2">
+      <label class="filter-input-label">Group By Kode Unit Distribusi:</label>
 
-    <InlineRadioGroup
-      @update:group-value="(value) => (data.groupBy = value.id === 2)"
-      :radio-items="[
+      <InlineRadioGroup @update:group-value="(value) => (data.groupBy = value.id === 2)" :radio-items="[
         { id: 1, title: 'Tidak', checked: true },
         { id: 2, title: 'Ya, Grupkan' }
-      ]"
-    />
+      ]" />
+    </div>
   </div>
+
 </template>