diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 65f399c6..c7afa790 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -873,6 +873,7 @@ watch(locale, () => {
         onSubmit();
       }
     "
+    :close="() => (modal = false)"
   >
     <template #information>
       <FormBranchInformation
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index 013a25fe..9f6344c5 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -975,7 +975,6 @@ async function assignFormDataEmployee(id: string) {
       citizenId: fetchOther.citizenId,
     };
 
-    formDataEmployeeTab.value = 'personalInfo';
     currentEmployeeCode.value = foundEmployee.code;
     currentEmployee.value = foundEmployee;
     profileUrl.value = foundEmployee.profileImageUrl;
@@ -1713,25 +1712,25 @@ watch(selectorLabel, async () => {
     :title="$t('customerCardUserType')"
     no-footer
     no-app-box
-    max-width="80%"
+    width="60vw"
+    height="50vh"
+    :close="() => (dialogCustomerType = false)"
   >
-    <template #body>
-      <div class="row q-gutter-xl q-pa-sm">
-        <ItemCard
-          class="col"
-          v-for="i in itemCard"
-          :key="i.text"
-          :icon="i.icon"
-          :text="i.text"
-          :color="i.color"
-          @trigger="
-            () => {
-              triggerCreate(i.text === 'customerLegalEntity' ? 'CORP' : 'PERS');
-            }
-          "
-        />
-      </div>
-    </template>
+    <div class="row full-width items-center">
+      <ItemCard
+        class="col q-mx-sm"
+        v-for="i in itemCard"
+        :key="i.text"
+        :icon="i.icon"
+        :text="i.text"
+        :color="i.color"
+        @trigger="
+          () => {
+            triggerCreate(i.text === 'customerLegalEntity' ? 'CORP' : 'PERS');
+          }
+        "
+      />
+    </div>
   </FormDialog>
 
   <FormDialog
@@ -1743,7 +1742,11 @@ watch(selectorLabel, async () => {
         onSubmit();
       }
     "
-    :close="() => {}"
+    :close="
+      () => {
+        dialogInputForm = false;
+      }
+    "
   >
     <template #prepend>
       <ProfileUpload
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index d9dc9f8f..cf34dae8 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -19,6 +19,7 @@ import ServiceProperties from 'src/components/04_product-service/ServiceProperti
 import WorkNameManagement from 'src/components/04_product-service/WorkNameManagement.vue';
 import useOptionStore from 'src/stores/options';
 import FormServiceProperties from 'src/components/04_product-service/FormServiceProperties.vue';
+import InfoForm from 'src/components/02_personnel-management/InfoForm.vue';
 
 import useFlowStore from 'src/stores/flow';
 import { Status } from 'src/stores/types';
@@ -1763,17 +1764,21 @@ watch(currentPageService, async () => {
     :close="() => (drawerInfo = false)"
   >
     <template #info>
-      <AppBox class="q-ma-md" bordered>
-        <BasicInformation
-          dense
-          :isType="productMode === 'type'"
-          :readonly="!isEdit"
-          v-model:remark="formDataGroup.remark"
-          v-model:name="formDataGroup.name"
-          v-model:code="formDataGroup.code"
-          v-model:detail="formDataGroup.detail"
-        />
-      </AppBox>
+      <InfoForm noAddress>
+        <template #information>
+          <!-- <AppBox class="q-ma-md" bordered> -->
+          <BasicInformation
+            dense
+            :isType="productMode === 'type'"
+            :readonly="!isEdit"
+            v-model:remark="formDataGroup.remark"
+            v-model:name="formDataGroup.name"
+            v-model:code="formDataGroup.code"
+            v-model:detail="formDataGroup.detail"
+          />
+          <!-- </AppBox> -->
+        </template>
+      </InfoForm>
     </template>
   </DrawerInfo>