diff --git a/src/components/03_customer-management/HistoryEditComponent.vue b/src/components/03_customer-management/HistoryEditComponent.vue
index dd1184b5..5e72025c 100644
--- a/src/components/03_customer-management/HistoryEditComponent.vue
+++ b/src/components/03_customer-management/HistoryEditComponent.vue
@@ -17,7 +17,7 @@ const historyList = defineModel<EmployeeHistory[]>('historyList', {
 const columns: QTableColumn[] = [
   {
     name: 'updatedAt',
-    label: t('time'),
+    label: t('general.time'),
     field: 'updatedAt',
     align: 'left',
     headerStyle: 'font-weight: bold',
@@ -25,7 +25,7 @@ const columns: QTableColumn[] = [
   {
     name: 'updatedBy',
     align: 'center',
-    label: t('editBy'),
+    label: t('general.updatedBy'),
     field: 'updatedBy',
     headerStyle: 'font-weight: bold',
   },
@@ -39,14 +39,14 @@ const columns: QTableColumn[] = [
   {
     name: 'valueAfter',
     align: 'center',
-    label: t('valueAfter'),
+    label: t('general.afterEdit'),
     field: 'valueAfter',
     headerStyle: 'font-weight: bold',
   },
   {
     name: 'valueBefore',
     align: 'center',
-    label: t('valueBefore'),
+    label: t('general.beforeEdit'),
     field: 'valueBefore',
     headerStyle: 'font-weight: bold',
   },
@@ -61,144 +61,192 @@ const formatList = ref<NewEmployeeHistory[]>([]);
 const fieldName = [
   {
     name: 'customerBranchId',
-    title: 'formDialogTitleInformation',
-    i18n: 'formDialogEmployerID',
+    title: 'form.field.basicInformation',
+    i18n: 'customer.form.branchCode',
   },
   {
     name: 'nrcNo',
-    title: 'formDialogTitleInformation',
+    title: 'form.field.basicInformation',
     i18n: 'customerEmployee.form.nrcNo',
   },
 
   {
     name: 'firstName',
-    title: 'personalInfo',
+    title: 'customerEmployee.form.group.personalInfo',
     i18n: 'form.firstName',
   },
   {
     name: 'firstNameEN',
-    title: 'personalInfo',
+    title: 'customerEmployee.form.group.personalInfo',
     i18n: 'form.firstNameEN',
   },
-  { name: 'lastName', title: 'personalInfo', i18n: 'formDialogInputLastName' },
+  {
+    name: 'lastName',
+    title: 'customerEmployee.form.group.personalInfo',
+    i18n: 'form.lastName',
+  },
   {
     name: 'lastNameEN',
-    title: 'personalInfo',
+    title: 'customerEmployee.form.group.personalInfo',
     i18n: 'form.lastNameEN',
   },
+  {
+    name: 'middleName',
+    title: 'customerEmployee.form.group.personalInfo',
+    i18n: 'form.middleName',
+  },
+  {
+    name: 'middleNameEN',
+    title: 'customerEmployee.form.group.personalInfo',
+    i18n: 'form.middleNameEN',
+  },
   {
     name: 'dateOfBirth',
-    title: 'personalInfo',
+    title: 'customerEmployee.form.group.personalInfo',
     i18n: 'form.birthDate',
   },
-  { name: 'gender', title: 'personalInfo', i18n: 'formDialogInputGender' },
+  {
+    name: 'gender',
+    title: 'customerEmployee.form.group.personalInfo',
+    i18n: 'form.gender',
+  },
   {
     name: 'nationality',
-    title: 'personalInfo',
+    title: 'customerEmployee.form.group.personalInfo',
     i18n: 'general.nationality',
   },
 
   {
     name: 'address',
-    title: 'formDialogTitlePersonnelAddress',
-    i18n: 'formDialogTitleAddressPure',
+    title: 'form.field.address',
+    i18n: 'form.addressNo',
   },
   {
     name: 'addressEN',
-    title: 'formDialogTitlePersonnelAddress',
-    i18n: 'formDialogTitleAddressPureEN',
+    title: 'form.field.address',
+    i18n: 'form.addressNo',
+  },
+  {
+    name: 'moo',
+    title: 'form.field.address',
+    i18n: 'form.moo',
+  },
+  {
+    name: 'mooEN',
+    title: 'form.field.address',
+    i18n: 'form.moo',
+  },
+  {
+    name: 'soi',
+    title: 'form.field.address',
+    i18n: 'form.soi',
+  },
+  {
+    name: 'soiEN',
+    title: 'form.field.address',
+    i18n: 'form.soi',
+  },
+  {
+    name: 'street',
+    title: 'form.field.address',
+    i18n: 'form.road',
+  },
+  {
+    name: 'streetEN',
+    title: 'form.field.address',
+    i18n: 'form.road',
   },
   {
     name: 'provinceId',
-    title: 'formDialogTitlePersonnelAddress',
-    i18n: 'province',
+    title: 'form.field.address',
+    i18n: 'form.province',
   },
   {
     name: 'districtId',
-    title: 'formDialogTitlePersonnelAddress',
-    i18n: 'district',
+    title: 'form.field.address',
+    i18n: 'form.district',
   },
   {
     name: 'subDistrictId',
-    title: 'formDialogTitlePersonnelAddress',
-    i18n: 'subDistrict',
+    title: 'form.field.address',
+    i18n: 'form.subDistrict',
   },
 
   {
     name: 'passportType',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputPassportType',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportType',
   },
   {
     name: 'passportNumber',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputPassportNo',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportNo',
   },
   {
     name: 'previousPassportReference',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputPassportRef',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportRef',
   },
   {
     name: 'passportIssuingPlace',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputWPassportPlace',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportPlace',
   },
   {
     name: 'passportIssuingCountry',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputPassportCountry',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportIssuer',
   },
   {
     name: 'passportIssueDate',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputPassportIssuance',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportIssueDate',
   },
   {
     name: 'passportExpiryDate',
-    title: 'formDialogTitlePassport',
-    i18n: 'formDialogInputPassportExpire',
+    title: 'customerEmployee.form.group.passport',
+    i18n: 'customerEmployee.form.passportExpireDate',
   },
 
   {
     name: 'visaType',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaType',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaType',
   },
   {
     name: 'visaNumber',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaNo',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaNo',
   },
   {
     name: 'visaIssueDate',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaIssuance',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaIssuance',
   },
   {
     name: 'visaExpiryDate',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaExpire',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaExpire',
   },
   {
     name: 'visaIssuingPlace',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaPlace',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaPlace',
   },
   {
     name: 'visaStayUntilDate',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaStayUntil',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaStayUntil',
   },
   {
     name: 'tm6Number',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaTM6',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaTM6',
   },
   {
     name: 'entryDate',
-    title: 'formDialogTitleVisa',
-    i18n: 'formDialogInputVisaEnter',
+    title: 'customerEmployee.form.group.visa',
+    i18n: 'customerEmployee.form.visaEnter',
   },
 ];
 
diff --git a/src/i18n/eng/index.ts b/src/i18n/eng/index.ts
index 380a4ddd..4fe9dcdc 100644
--- a/src/i18n/eng/index.ts
+++ b/src/i18n/eng/index.ts
@@ -90,6 +90,10 @@ export default {
     for: 'for {msg}',
     history: 'History',
     historyEdit: 'Edit History',
+    time: 'Time',
+    updatedBy: 'Updated By',
+    beforeEdit: 'Before',
+    afterEdit: 'After',
   },
 
   menu: {
diff --git a/src/i18n/tha/index.ts b/src/i18n/tha/index.ts
index 6e0f327d..2ad3621b 100644
--- a/src/i18n/tha/index.ts
+++ b/src/i18n/tha/index.ts
@@ -90,6 +90,10 @@ export default {
     for: 'เพื่อ{msg}',
     history: 'ประวัติ',
     historyEdit: 'ประวัติการแก้ไข',
+    time: 'เวลา',
+    updatedBy: 'แก้ไขโดย',
+    beforeEdit: 'ค่าเดิม',
+    afterEdit: 'แก้ใหม่',
   },
 
   menu: {