diff --git a/result-entry/components/detailPatient.vue b/result-entry/components/detailPatient.vue
index 7a6fd99..6c1f5a7 100644
--- a/result-entry/components/detailPatient.vue
+++ b/result-entry/components/detailPatient.vue
@@ -4,52 +4,29 @@
 
             <v-row>
                 <v-col cols="2">
-                    <v-menu
-                        v-model="menu"
-                        :close-on-content-click="false"
-                        transition="scale-transition"
-                        offset-y
-                        min-width="auto"
-                        max-width="290px"
-                    >
-                        <template v-slot:activator="{ props  }">
-                        <v-text-field
-                            :model-value="formatDate()"
-                            label="Tanggal Mulai"
-                            prepend-inner-icon="mdi-calendar"
-                            hide-details
-                            readonly
-                            variant="outlined"
-                            v-bind="props"
-                        ></v-text-field>
-                        </template>
-                        <v-date-picker
-                        hide-header
-                        show-adjacent-months
-                        rounded="lg"
-                        color="primary"
-                        v-model="date"
-                        @update:modelValue="menu=false"
-                        ></v-date-picker>
-                    </v-menu>
+                    <v-text-field 
+                        :label="$t('message.tableDetailPatient.navbar.date')"
+                        variant="outlined"
+                        hide-details
+                    ></v-text-field>
                 </v-col>
                 <v-col cols="5">
                     <v-text-field 
-                        label="No Reg / Nama / Jenis Kelamin" 
+                        :label="$t('message.tableDetailPatient.navbar.noreg')"
                         variant="outlined"
                         hide-details
                     ></v-text-field>
                 </v-col>
                 <v-col cols="2.5">
                     <v-text-field 
-                        label="DOB / Umur" 
+                        :label="$t('message.tableDetailPatient.navbar.dob')"
                         variant="outlined"
                         hide-details
                     ></v-text-field>
                 </v-col>
                 <v-col cols="2.5">
                     <v-text-field 
-                        label="Pengirim" 
+                        :label="$t('message.tableDetailPatient.navbar.sender')"
                         variant="outlined"
                         hide-details
                     ></v-text-field>
@@ -63,6 +40,15 @@
                 hide-default-footer
                 class="pt-5"
             >
+                <template v-slot:headers="{ columns }">
+                    <tr>
+                        <template v-for="column in columns" :key="column.key">
+                            <td :class="column.class" :style="{ width: column.width, textAlign: column.align }">
+                                <span>{{ column.title }}</span>
+                            </td>
+                        </template>
+                    </tr>
+                </template>
                 <template v-slot:item="{ item }">
                     <tr>
                         <td class="text-left" v-if="item.is_result == 'N'" colspan="8">
@@ -147,7 +133,7 @@
                         key: 'name',
                         sortable: false,
                         width: "15%",
-                        title: "NAMA PEMERIKSAAN",
+                        title: this.$t('message.tableDetailPatient.header.name'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
@@ -155,7 +141,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "20%",
-                        title: "HASIL",
+                        title: this.$t('message.tableDetailPatient.header.result'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
@@ -163,7 +149,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "5%",
-                        title: "FLAG",
+                        title: this.$t('message.tableDetailPatient.header.flag'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
@@ -171,7 +157,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "10%",
-                        title: "NILAI NORMAL",
+                        title: this.$t('message.tableDetailPatient.header.normalvalue'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
@@ -179,7 +165,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "10%",
-                        title: "UNIT",
+                        title: this.$t('message.tableDetailPatient.header.unit'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
@@ -187,7 +173,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "20%",
-                        title: "METODE",
+                        title: this.$t('message.tableDetailPatient.header.method'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
@@ -195,7 +181,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "20%",
-                        title: "CATATAN",
+                        title: this.$t('message.tableDetailPatient.header.note'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                 ],
diff --git a/result-entry/components/listPatient.vue b/result-entry/components/listPatient.vue
index 68f91cb..af24e2b 100644
--- a/result-entry/components/listPatient.vue
+++ b/result-entry/components/listPatient.vue
@@ -15,6 +15,16 @@
                     </v-toolbar>
                 </template>
 
+                <template v-slot:headers="{ columns }">
+                    <tr>
+                        <template v-for="column in columns" :key="column.key">
+                            <td :class="column.class" :style="{ width: column.width, textAlign: column.align }">
+                                <span>{{ column.title }}</span>
+                            </td>
+                        </template>
+                    </tr>
+                </template>
+
                 <template v-slot:item="{ item }">
                     <tr v-bind:class="{'bg-primary-lighten':isSelected(item)}" @click="selectMe(item)">
                         <td>
@@ -54,7 +64,7 @@
                         key: 'name',
                         sortable: false,
                         width: "50%",
-                        title: this.$t('message.table.noreg'),
+                        title: this.$t('message.tableListPatient.noreg'),
                         class: "font-weight-bold",
                     },
                     { 
@@ -62,7 +72,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "50%",
-                        title: this.$t('message.table.name'),
+                        title: this.$t('message.tableListPatient.name'),
                         class: "font-weight-bold",
                     },
                 ],
diff --git a/result-entry/components/searchPatient.vue b/result-entry/components/searchPatient.vue
index 12586da..026b1ed 100644
--- a/result-entry/components/searchPatient.vue
+++ b/result-entry/components/searchPatient.vue
@@ -15,7 +15,7 @@
                 <template v-slot:activator="{ props  }">
                   <v-text-field
                     :model-value="formatDate()"
-                    label="Tanggal Mulai"
+                    :label="$t('message.search.startdate')"
                     prepend-inner-icon="mdi-calendar"
                     hide-details
                     readonly
@@ -43,7 +43,7 @@
                 <template v-slot:activator="{ props  }">
                   <v-text-field
                     :model-value="formatDate()"
-                    label="Tanggal Selesai"
+                    :label="$t('message.search.enddate')"
                     prepend-inner-icon="mdi-calendar"
                     hide-details
                     readonly
@@ -64,7 +64,7 @@
           </v-col>
           <v-col cols="2.5">
             <v-text-field 
-              label="No Reg / Nama" 
+              :label="$t('message.search.noreg')"
               variant="outlined"
               hide-details
               append-inner-icon="mdi-magnify"
@@ -72,7 +72,7 @@
           </v-col>
           <v-col cols="2.5">
             <v-autocomplete
-              label="Grup Pemeriksaan"
+              :label="$t('message.search.group')"
               variant="outlined"
               hide-details
               menu-icon="mdi-chevron-down"
@@ -93,40 +93,36 @@
           </v-col>
           <v-col cols="3">
             <div style="height: 100%;">
-              <v-row class="pt-3 justify-end">
+              <v-row class="pt-4 justify-end ga-2">
                 <v-btn fab 
                     variant="tonal"
                     small
                     style="height: auto;"
                     color="secondary"
-                    class="bg-secondary-lighten rounded-lg mr-2">
+                    class="bg-secondary-lighten rounded-lg">
                     <iconify-icon
                         style="font-size: 2rem;"
                         icon="fluent:notepad-person-24-regular"
                     ></iconify-icon>
                 </v-btn>
 
-                <div
-                  class="pt-3 pa-3"
-                >
+                <div>
                     <v-btn
-                        small
                         class="bg-primary-lighten"
                         variant="tonal"
                         color="primary"
+                        size="x-large"
                     >
-                        HISTORY
+                    {{ $t('message.search.history') }}
                     </v-btn>
                 </div>
-                <div
-                  class="pt-3 pa-3"
-                >
+                <div>
                     <v-btn
                         variant="flat"
-                        small
-                        class="bg-primary text-white"
+                        class="bg-primary text-white mr-2"
+                        size="x-large"
                     >
-                        SIMPAN
+                    {{ $t('message.search.save') }}
                     </v-btn>
                 </div>
               </v-row>
diff --git a/result-entry/language.js b/result-entry/language.js
index fa41acf..fde8068 100644
--- a/result-entry/language.js
+++ b/result-entry/language.js
@@ -1,20 +1,70 @@
 var CustomMessages = {
     en: {
         message: {
-        toolbalTitle: "PATIENT",
-        table: {
-            noreg: "NO. REG",
-            name: "NAME",
-        },
+            search: {
+                startdate: "Start Date",
+                enddate: "End Date",
+                noreg: "No. Reg / Name",
+                group: "Examination Group",
+                history: "History",
+                save: "Save"
+            },
+            toolbalTitle: "PATIENT",
+            tableListPatient: {
+                noreg: "NO. REG",
+                name: "NAME",
+            },
+            tableDetailPatient: {
+                navbar: {
+                    date: "Date",
+                    noreg: "No. Reg / Name / Gender",
+                    dob: "DOB / Age",
+                    sender: "Sender"
+                },
+                header: {
+                    name: "EXAMINATION NAME",
+                    result: "RESULT",
+                    flag: "FLAG",
+                    normalvalue: "NORMAL VALUE",
+                    unit: "UNIT",
+                    method: "METHOD",
+                    note: "NOTE"
+                }
+            }
         },
     },
     id: {
         message: {
-        toolbalTitle: "PASIEN",
-        table: {
-            noreg: "NO. REG",
-            name: "NAMA",
-        },
+            search: {
+                startdate: "Tanggal Mulai",
+                enddate: "Tanggal Selesai",
+                noreg: "No. Reg / Nama",
+                group: "Grup Pemeriksaan",
+                history: "Riwayat",
+                save: "Simpan"
+            },
+            toolbalTitle: "PASIEN",
+            tableListPatient: {
+                noreg: "NO. REG",
+                name: "NAMA",
+            },
+            tableDetailPatient: {
+                navbar: {
+                    date: "Tanggal",
+                    noreg: "No. Reg / Nama / Jenis Kelamin",
+                    dob: "DOB / Umur",
+                    sender: "Pengirim"
+                },
+                header: {
+                    name: "NAMA PEMERIKSAAN",
+                    result: "HASIL",
+                    flag: "FLAG",
+                    normalvalue: "NILAI NORMAL",
+                    unit: "UNIT",
+                    method: "METODE",
+                    note: "CATATAN"
+                }
+            }
         },
     },
 };
\ No newline at end of file
diff --git a/result-verification/components/detailPatient.vue b/result-verification/components/detailPatient.vue
index eddc3ef..12cf9cc 100644
--- a/result-verification/components/detailPatient.vue
+++ b/result-verification/components/detailPatient.vue
@@ -3,52 +3,29 @@
         <v-container class="bg-white rounded-lg" fluid>
             <v-row>
                 <v-col cols="2">
-                    <v-menu
-                        v-model="menu"
-                        :close-on-content-click="false"
-                        transition="scale-transition"
-                        offset-y
-                        min-width="auto"
-                        max-width="290px"
-                    >
-                        <template v-slot:activator="{ props  }">
-                        <v-text-field
-                            :model-value="formatDate()"
-                            label="Tanggal Mulai"
-                            prepend-inner-icon="mdi-calendar"
-                            hide-details
-                            readonly
-                            variant="outlined"
-                            v-bind="props"
-                        ></v-text-field>
-                        </template>
-                        <v-date-picker
-                        hide-header
-                        show-adjacent-months
-                        rounded="lg"
-                        color="primary"
-                        v-model="date"
-                        @update:modelValue="menu=false"
-                        ></v-date-picker>
-                    </v-menu>
+                    <v-text-field 
+                        :label="$t('message.tableDetailPatient.navbar.date')"
+                        variant="outlined"
+                        hide-details
+                    ></v-text-field>
                 </v-col>
                 <v-col cols="5">
                     <v-text-field 
-                        label="No Reg / Nama / Jenis Kelamin" 
+                        :label="$t('message.tableDetailPatient.navbar.noreg')"
                         variant="outlined"
                         hide-details
                     ></v-text-field>
                 </v-col>
                 <v-col cols="2.5">
                     <v-text-field 
-                        label="DOB / Umur" 
+                        :label="$t('message.tableDetailPatient.navbar.dob')"
                         variant="outlined"
                         hide-details
                     ></v-text-field>
                 </v-col>
                 <v-col cols="2.5">
                     <v-text-field 
-                        label="Pengirim" 
+                        :label="$t('message.tableDetailPatient.navbar.sender')"
                         variant="outlined"
                         hide-details
                     ></v-text-field>
@@ -62,7 +39,15 @@
                 hide-default-footer
                 class="pt-5"
             >
-
+                <template v-slot:headers="{ columns }">
+                    <tr>
+                        <template v-for="column in columns" :key="column.key">
+                            <td :class="column.class" :style="{ width: column.width, textAlign: column.align }">
+                                <span>{{ column.title }}</span>
+                            </td>
+                        </template>
+                    </tr>
+                </template>
                 <template v-slot:item="{ item }">
                     <tr>
                         <td class="text-left" v-if="item.is_result == 'N'" colspan="8">
@@ -92,7 +77,9 @@
                         <td class="text-left" v-if="item.is_result == 'Y'">
                             <div class="d-flex justify-center">
                                 <div
-                                    class="pointer bg-error-lighten"
+                                    :dark="item.validation_old != 'Y'"
+                                    :disabled="item.validation_old == 'Y'"
+                                    class="pointer bg-error-lighten rounded-lg"
                                     style="height: 40px; width: 40px; display: flex; align-items: center; justify-content: center;"
                                 >
                                     <iconify-icon
@@ -102,7 +89,8 @@
                                     ></iconify-icon>
                                 </div>
                                 <div
-                                    class="pointer bg-success-lighten ml-2"
+                                    :disabled="item.validation == 'Y'"
+                                    class="pointer bg-success-lighten rounded-lg ml-2"
                                     style="height: 40px; width: 40px; display: flex; align-items: center; justify-content: center;"
                                 >
                                     <iconify-icon
@@ -145,63 +133,63 @@
                         key: 'name',
                         sortable: false,
                         width: "15%",
-                        title: "NAMA PEMERIKSAAN",
+                        title: this.$t('message.tableDetailPatient.header.name'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'result', 
                         sortable: false,
                         width: "10%",
-                        title: "HASIL",
+                        title: this.$t('message.tableDetailPatient.header.result'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'flag', 
                         sortable: false,
                         width: "10%",
-                        title: "FLAG",
+                        title: this.$t('message.tableDetailPatient.header.flag'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'nilai', 
                         sortable: false,
                         width: "10%",
-                        title: "NILAI NORMAL",
+                        title: this.$t('message.tableDetailPatient.header.normalvalue'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'unit', 
                         sortable: false,
                         width: "10%",
-                        title: "UNIT",
+                        title: this.$t('message.tableDetailPatient.header.unit'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'metode', 
                         sortable: false,
                         width: "15%",
-                        title: "METODE",
+                        title: this.$t('message.tableDetailPatient.header.method'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'note', 
                         sortable: false,
                         width: "15%",
-                        title: "CATATAN",
+                        title: this.$t('message.tableDetailPatient.header.note'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                     { 
                         align: 'start',
-                        key: 'name', 
+                        key: 'validasi', 
                         sortable: false,
                         width: "5%",
-                        title: "VALIDASI",
+                        title: this.$t('message.tableDetailPatient.header.verification'),
                         class: "bg-secondary-lighten font-weight-bold",
                     },
                 ],
diff --git a/result-verification/components/listPatient.vue b/result-verification/components/listPatient.vue
index 81ae880..44f9146 100644
--- a/result-verification/components/listPatient.vue
+++ b/result-verification/components/listPatient.vue
@@ -15,6 +15,16 @@
                     </v-toolbar>
                 </template>
 
+                <template v-slot:headers="{ columns }">
+                    <tr>
+                        <template v-for="column in columns" :key="column.key">
+                            <td :class="column.class" :style="{ width: column.width, textAlign: column.align }">
+                                <span>{{ column.title }}</span>
+                            </td>
+                        </template>
+                    </tr>
+                </template>
+
                 <template v-slot:item="{ item }">
                     <tr v-bind:class="{'bg-primary-lighten':isSelected(item)}" @click="selectMe(item)">
                         <td>
@@ -54,7 +64,7 @@
                         key: 'name',
                         sortable: false,
                         width: "50%",
-                        title: this.$t('message.table.noreg'),
+                        title: this.$t('message.tableListPatient.noreg'),
                         class: "font-weight-bold",
                     },
                     { 
@@ -62,7 +72,7 @@
                         key: 'name', 
                         sortable: false,
                         width: "50%",
-                        title: this.$t('message.table.name'),
+                        title: this.$t('message.tableListPatient.name'),
                         class: "font-weight-bold",
                     },
                 ],
diff --git a/result-verification/components/searchPatient.vue b/result-verification/components/searchPatient.vue
index 1e22941..dbb6e38 100644
--- a/result-verification/components/searchPatient.vue
+++ b/result-verification/components/searchPatient.vue
@@ -15,7 +15,7 @@
             <template v-slot:activator="{ props  }">
               <v-text-field
                 :model-value="formatDate()"
-                label="Tanggal Mulai"
+                :label="$t('message.search.startdate')"
                 prepend-inner-icon="mdi-calendar"
                 hide-details
                 readonly
@@ -43,7 +43,7 @@
             <template v-slot:activator="{ props  }">
               <v-text-field
                 :model-value="formatDate()"
-                label="Tanggal Selesai"
+                :label="$t('message.search.enddate')"
                 prepend-inner-icon="mdi-calendar"
                 hide-details
                 readonly
@@ -64,7 +64,7 @@
         </v-col>
         <v-col cols="2.5">
           <v-text-field 
-            label="No Reg / Nama" 
+            :label="$t('message.search.noreg')"
             variant="outlined"
             hide-details
             append-inner-icon="mdi-magnify"
@@ -72,7 +72,7 @@
         </v-col>
         <v-col cols="2.5">
           <v-autocomplete
-            label="Grup Pemeriksaan"
+            :label="$t('message.search.group')"
             variant="outlined"
             hide-details
             menu-icon="mdi-chevron-down"
@@ -94,15 +94,14 @@
         <v-col cols="3">
           <div style="height: 100%;">
             <v-row class="pt-3 justify-end">
-              <div
-                class="pt-3 pa-3"
-              >
+              <div>
                 <v-btn
-                  class="bg-primary-lighten"
+                  class="bg-primary-lighten mr-2"
                   variant="tonal"
                   color="primary"
+                  size="x-large"
                 >
-                HISTORY
+                {{ $t('message.search.history') }}
               </v-btn>
               </div>
             </v-row>
diff --git a/result-verification/language.js b/result-verification/language.js
index fa41acf..1ec973f 100644
--- a/result-verification/language.js
+++ b/result-verification/language.js
@@ -1,20 +1,70 @@
 var CustomMessages = {
     en: {
         message: {
-        toolbalTitle: "PATIENT",
-        table: {
-            noreg: "NO. REG",
-            name: "NAME",
-        },
+            search: {
+                startdate: "Start Date",
+                enddate: "End Date",
+                noreg: "No. Reg / Name",
+                group: "Examination Group",
+                history: "History",
+            },
+            toolbalTitle: "PATIENT",
+            tableListPatient: {
+                noreg: "NO. REG",
+                name: "NAME",
+            },
+            tableDetailPatient: {
+                navbar: {
+                    date: "Date",
+                    noreg: "No. Reg / Name / Gender",
+                    dob: "DOB / Age",
+                    sender: "Sender"
+                },
+                header: {
+                    name: "EXAMINATION NAME",
+                    result: "RESULT",
+                    flag: "FLAG",
+                    normalvalue: "NORMAL VALUE",
+                    unit: "UNIT",
+                    method: "METHOD",
+                    note: "NOTE",
+                    verification: "VERIFICATION"
+                }
+            }
         },
     },
     id: {
         message: {
-        toolbalTitle: "PASIEN",
-        table: {
-            noreg: "NO. REG",
-            name: "NAMA",
-        },
+            search: {
+                startdate: "Tanggal Mulai",
+                enddate: "Tanggal Selesai",
+                noreg: "No. Reg / Nama",
+                group: "Grup Pemeriksaan",
+                history: "Riwayat",
+            },
+            toolbalTitle: "PASIEN",
+            tableListPatient: {
+                noreg: "NO. REG",
+                name: "NAMA",
+            },
+            tableDetailPatient: {
+                navbar: {
+                    date: "Tanggal",
+                    noreg: "No. Reg / Nama / Jenis Kelamin",
+                    dob: "DOB / Umur",
+                    sender: "Pengirim"
+                },
+                header: {
+                    name: "NAMA PEMERIKSAAN",
+                    result: "HASIL",
+                    flag: "FLAG",
+                    normalvalue: "NILAI NORMAL",
+                    unit: "UNIT",
+                    method: "METODE",
+                    note: "CATATAN",
+                    verification: "VERIFFIKASI"
+                }
+            }
         },
     },
 };
\ No newline at end of file