diff --git a/src/modules/04_registryPerson/components/DialogHistory.vue b/src/modules/04_registryPerson/components/DialogHistory.vue
index 607e9f2a5..797e41d59 100644
--- a/src/modules/04_registryPerson/components/DialogHistory.vue
+++ b/src/modules/04_registryPerson/components/DialogHistory.vue
@@ -261,8 +261,8 @@ function closeDialog() {
         <q-form ref="myForm">
           <div class="col-12 bg-grey-2 q-pa-sm">
             <div class="col-12 row q-pb-sm q-col-gutter-sm items-center"></div>
-            <div class="q-col-gutter-xs row no-wrap">
-              <div class="col-4">
+            <q-toolbar>
+              <div class="row q-col-gutter-sm">
                 <q-select
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภท'}`]"
@@ -279,9 +279,9 @@ function closeDialog() {
                   use-input
                   input-debounce="0"
                   @update:model-value="changeEmployeeClass"
+                  style="width: 250px"
                 />
-              </div>
-              <div class="col-3">
+
                 <q-select
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ฟิลด์ที่จะค้น'}`]"
@@ -298,59 +298,18 @@ function closeDialog() {
                   use-input
                   input-debounce="0"
                   @update:model-value="selectTypeKeyword(typeKeyword)"
+                  style="width: 250px"
                 />
               </div>
 
-              <div class="col" v-if="typeKeyword === 'no'">
-                <q-input
-                  borderless
-                  outlined
-                  dense
-                  debounce="300"
-                  v-model="Keyword"
-                  placeholder="ตำแหน่งเลขที่"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอก ตำแหน่งเลขที่'}`]"
-                  hide-bottom-space
-                />
-              </div>
-
-              <div class="col" v-if="typeKeyword === 'position'">
-                <q-select
-                  hide-bottom-space
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือก ตำแหน่ง'}`]"
-                  outlined
-                  dense
-                  v-model="positionKeyword"
-                  emit-value
-                  map-options
-                  :options="options"
-                  option-label="name"
-                  option-value="id"
-                  :label="`${' เลือกตำแหน่ง'}`"
-                  use-input
-                  input-debounce="0"
-                  @filter="filterFn"
-                  behavior="menu"
-                >
-                  <template v-slot:no-option>
-                    <q-item>
-                      <q-item-section class="text-grey">
-                        ไม่มีข้อมูล
-                      </q-item-section>
-                    </q-item>
-                  </template></q-select
-                >
-              </div>
-
               <q-space />
-
               <q-btn
                 color="primary"
                 icon="mdi-magnify"
                 label="ค้นหา"
                 @click="clickSearch(employeeClass)"
               />
-            </div>
+            </q-toolbar>
           </div>
 
           <div class="col-12 q-mt-sm">
diff --git a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
index 9e42e94c9..4894b6d90 100644
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue
@@ -256,7 +256,6 @@ onMounted(() => {
       map-options
       :options="columns"
       option-value="name"
-      
       style="min-width: 140px"
     />
     <q-btn-toggle
@@ -366,7 +365,7 @@ onMounted(() => {
                 flat
                 round
                 @click="openDialogEdit(props.row)"
-                ><q-tooltip>แก้ไข</q-tooltip></q-btn
+                ><q-tooltip>แก้ไขข้อมูล</q-tooltip></q-btn
               >
             </div>
           </div>
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
index 1d31955f2..91716d594 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -1008,7 +1008,7 @@ onMounted(async () => {
                 />
               </div>
             </div>
-            <div class="row q-mt-md">
+            <div class="row">
               <div class="q-mr-sm">สถานภาพการมีชีวิต</div>
               <div>
                 <q-radio
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index bbc32d36f..f2af446c5 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1348,7 +1348,7 @@ onMounted(async () => {
                               @click="openEditDirector(props.row)"
                               icon="edit"
                             >
-                              <q-tooltip>แก้ไข</q-tooltip>
+                              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                             </q-btn>
                             <q-btn
                               v-if="!checkRoutePermisson && !isReadonly"
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 5e5c7f84f..fd73a0892 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -1551,7 +1551,7 @@ onMounted(async () => {
                               @click="openEditDirector(props.row)"
                               icon="edit"
                             >
-                              <q-tooltip>แก้ไข</q-tooltip>
+                              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                             </q-btn>
 
                             <q-btn