diff --git a/components/pendaftaran/CardAntrianList.vue b/components/pendaftaran/CardAntrianList.vue
index 8e51aa3..6b898a5 100644
--- a/components/pendaftaran/CardAntrianList.vue
+++ b/components/pendaftaran/CardAntrianList.vue
@@ -206,7 +206,7 @@ onUnmounted(() => {
                                 </div>
                                  <!-- Medical Details Grid -->
                                 <v-row dense class="mt-2">
-                                    <v-col cols="4">
+                                    <v-col cols="3">
                                         <div class="d-flex align-center mb-2">
                                             <Icon icon="solar:card-bold" height="16" class="mr-2 text-primary" />
                                             <span class="text-body-1">{{ item.NoRekamMedis || '-' }}</span>
@@ -217,7 +217,7 @@ onUnmounted(() => {
                                         </div>
                                     </v-col>
 
-                                    <v-col cols="4">
+                                    <v-col cols="5">
                                         <div class="d-flex align-center mb-2">
                                             <Icon icon="solar:clipboard-list-bold" height="16" class="mr-2 text-primary" />
                                             <span class="text-body-1">{{ item.Kategori.split('-')[1]?.trim() || item.Kategori }}</span>
@@ -230,7 +230,7 @@ onUnmounted(() => {
                                     <v-col cols="4"   class="d-flex justify-end align-end">
                                         <v-btn-group density="compact" variant="outlined">
                                                 <template v-for="action in getActions(item)" :key="action.event">
-                                                    <v-btn v-bind="props" :color="action.color"
+                                                    <v-btn  :color="action.color"
                                                         :prepend-icon="action.icon" size="small" variant="tonal"
                                                         @click.stop="handleActionClick(action.event, item)">
                                                         {{ action.tooltip }}
diff --git a/components/pendaftaran/CardAntrianListV2.vue b/components/pendaftaran/CardAntrianListV2.vue
index 8a8c8f8..edde326 100644
--- a/components/pendaftaran/CardAntrianListV2.vue
+++ b/components/pendaftaran/CardAntrianListV2.vue
@@ -155,6 +155,10 @@ onUnmounted(() => {
                                     <Icon class="ml-1" :icon="getGenderIcon(item.JenisKelamin)"
                                         :class="getGenderColor(item.JenisKelamin)" height="16" />
                                 </h3>
+                                <div class="d-flex align-center mt-2">
+                                    <Icon icon="solar:calendar-date-bold" height="14" class="mr-1 text-medium-emphasis" />
+                                    <span class="text-body-2 text-medium-emphasis" >{{ formatDate(item.TglDaftar) }}</span>
+                                </div>
                                 <div class="d-flex ga-2 mt-2">
                                     <v-chip size="small" color="primary" variant="outlined" label
                                         class="font-weight-medium">
@@ -174,29 +178,25 @@ onUnmounted(() => {
                             <v-col cols="4">
                                 <v-row dense class="mt-6">
                                     <!-- Left Column -->
-                                    <v-col cols="6">
-                                        <div class="d-flex align-center mb-2">
-                                            <Icon icon="solar:card-bold" height="16" class="mr-2 text-primary" />
-                                            <span class="font-weight-medium">{{ item.NoRekamMedis || '-' }}</span>
-                                        </div>
+                                    <v-col cols="12" class="d-flex justify-space-between">
                                         <div class="d-flex align-center">
-                                            <Icon icon="solar:calendar-bold" height="16" class="mr-2 text-primary" />
-                                            <span class="font-weight-medium">{{ formatDate(item.TglDaftar) }}</span>
+                                            <Icon icon="solar:card-bold" height="16" class="mr-2 text-primary" />
+                                            <span style="font-size: 13px;">{{ item.NoRekamMedis || '-' }}</span>
+                                        </div>
+                                        <div class="d-flex align-center mb-2">
+                                            <Icon icon="solar:clipboard-list-bold" height="16" class="mr-2 text-primary" />
+                                            <span style="font-size: 13px;">{{ item.Kategori.split('-')[1]?.trim() ||
+                                                item.Kategori }}</span>
                                         </div>
                                     </v-col>
 
                                     <!-- Right Column -->
-                                    <v-col cols="6">
-                                        <div class="d-flex align-center mb-2">
-                                            <Icon icon="solar:clipboard-list-bold" height="16" class="mr-2 text-primary" />
-                                            <span class="font-weight-medium">{{ item.Kategori.split('-')[1]?.trim() ||
-                                                item.Kategori }}</span>
-                                        </div>
-                                        <div class="d-flex align-center">
+                                    <v-col cols="12">
+                                        <div class="d-flex">
                                             <Icon icon="solar:users-group-rounded-bold" height="16"
                                                 class="mr-2 text-primary" />
-                                            <span class="font-weight-medium">
-                                                {{ item.Spesialis.toUpperCase() }} <br>
+                                            <span style="font-size: 13px;">
+                                                {{ item.Spesialis.toUpperCase() }} -
                                                 {{item.SubSpesialis.toUpperCase() }}
                                             </span>
                                         </div>
diff --git a/components/pendaftaran/MedisPasienV2.vue b/components/pendaftaran/MedisPasienV2.vue
index ec5400e..076effb 100644
--- a/components/pendaftaran/MedisPasienV2.vue
+++ b/components/pendaftaran/MedisPasienV2.vue
@@ -383,7 +383,7 @@ defineExpose({
                                     ref="diagnosisInput"
                                     v-model="diagnosisForm.kodeDiagnosa"
                                     :items="diagnosisOptions"
-                                    placeholder="Search..."
+                                    placeholder="Cari..."
                                     variant="outlined"
                                     density="compact"
                                     hide-details
@@ -514,7 +514,7 @@ defineExpose({
                                     ref="tindakanInput"
                                     v-model="tindakanForm.kodeTindakan"
                                     :items="tindakanOptions"
-                                    placeholder="Search..."
+                                    placeholder="Cari..."
                                     variant="outlined"
                                     density="compact"
                                     hide-details
diff --git a/pages/antrean/all.vue b/pages/antrean/all.vue
index 536e783..4c27498 100644
--- a/pages/antrean/all.vue
+++ b/pages/antrean/all.vue
@@ -53,7 +53,7 @@ const filterOptions = [
         label: 'Filter Status',
         modelKey: 'statusFilter',
         showAllOption: true,
-        options: statusOptions.filter(opt => opt.value !== null),
+        options: statusOptions,
         defaultValue: null
     },
     {
@@ -268,9 +268,10 @@ const handleUpdateStatusSuccess = () => {
                         <div class="d-flex align-center ga-3 flex-wrap" style="width: 70%;">
                             <v-text-field
                                 v-model="search"
-                                placeholder="Search..."
+                                placeholder="Cari..."
                                 variant="outlined"
                                 density="compact"
+                                class="bg-white"
                                 hide-details
                                 prepend-inner-icon="mdi-magnify"
                                 style="max-width: 300px;"
diff --git a/pages/antrean/kategori/[id].vue b/pages/antrean/kategori/[id].vue
index 8201a64..bcdb60c 100644
--- a/pages/antrean/kategori/[id].vue
+++ b/pages/antrean/kategori/[id].vue
@@ -262,7 +262,7 @@ const handleUpdateStatusSuccess = () => {
                 <v-card-text>
                     <div class="d-flex justify-space-between align-center mb-4">
                         <div class="d-flex align-center ga-3 w-50">
-                            <v-text-field v-model="search" placeholder="Search..." variant="outlined" density="compact"
+                            <v-text-field v-model="search" placeholder="Cari..." variant="outlined" density="compact"
                                 hide-details prepend-inner-icon="mdi-magnify" style="max-width: 300px;"></v-text-field>
                             
                             <FilterSortMenu 
diff --git a/pages/antrean/spesialis/[kode].vue b/pages/antrean/spesialis/[kode].vue
index 556509e..9fb1517 100644
--- a/pages/antrean/spesialis/[kode].vue
+++ b/pages/antrean/spesialis/[kode].vue
@@ -264,7 +264,7 @@ const handleUpdateStatusSuccess = () => {
                 <v-card-text>
                     <div class="d-flex justify-space-between align-center mb-4">
                         <div class="d-flex align-center ga-3 w-50">
-                            <v-text-field v-model="search" placeholder="Search..." variant="outlined" density="compact"
+                            <v-text-field v-model="search" placeholder="Cari..." variant="outlined" density="compact"
                                 hide-details prepend-inner-icon="mdi-magnify" style="max-width: 300px;"></v-text-field>
                             
                             <FilterSortMenu 
diff --git a/pages/antrean/subspesialis/[kode].vue b/pages/antrean/subspesialis/[kode].vue
index ebed0d8..f1f918d 100644
--- a/pages/antrean/subspesialis/[kode].vue
+++ b/pages/antrean/subspesialis/[kode].vue
@@ -264,7 +264,7 @@ const handleUpdateStatusSuccess = () => {
                 <v-card-text>
                     <div class="d-flex justify-space-between align-center mb-4">
                         <div class="d-flex align-center ga-3 w-50">
-                            <v-text-field v-model="search" placeholder="Search..." variant="outlined" density="compact"
+                            <v-text-field v-model="search" placeholder="Cari..." variant="outlined" density="compact"
                                 hide-details prepend-inner-icon="mdi-magnify" style="max-width: 300px;"></v-text-field>
                             
                             <FilterSortMenu 
diff --git a/pages/setting/hak-akses/index.vue b/pages/setting/hak-akses/index.vue
index d366da3..959f983 100644
--- a/pages/setting/hak-akses/index.vue
+++ b/pages/setting/hak-akses/index.vue
@@ -157,7 +157,7 @@ definePageMeta({
                     <div class="d-flex justify-space-between align-center mb-4">
                         <v-text-field
                             v-model="search"
-                            placeholder="Search..."
+                            placeholder="Cari..."
                             variant="outlined"
                             density="comfortable"
                             hide-details
diff --git a/pages/setting/user/index.vue b/pages/setting/user/index.vue
index e0e11ff..b081fad 100644
--- a/pages/setting/user/index.vue
+++ b/pages/setting/user/index.vue
@@ -129,7 +129,7 @@ definePageMeta({
                     <div class="d-flex justify-space-between align-center mb-4">
                         <v-text-field
                             v-model="search"
-                            placeholder="Search..."
+                            placeholder="Cari..."
                             variant="outlined"
                             density="comfortable"
                             hide-details