diff --git a/app/components/app/doctor/entry-form.vue b/app/components/app/doctor/entry-form.vue
index b5ac8613..bfa9802e 100644
--- a/app/components/app/doctor/entry-form.vue
+++ b/app/components/app/doctor/entry-form.vue
@@ -23,20 +23,20 @@ const items = [
     <div class="mb-2 border-b border-b-slate-300 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>No. IHS</Label>
+          <FieldGroup :column="2">
+            <Label>No. IHS</Label>
             <Field>
               <Input />
             </Field>
           </FieldGroup>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>No. SIP</Label>
+          <FieldGroup :column="2">
+            <Label>No. SIP</Label>
             <Field>
               <Input />
             </Field>
           </FieldGroup>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Unit</Label>
+          <FieldGroup :column="2">
+            <Label>Unit</Label>
             <Field>
               <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
             </Field>
diff --git a/app/components/app/employee/entry-form.vue b/app/components/app/employee/entry-form.vue
index 73c45f98..7bb9dfd7 100644
--- a/app/components/app/employee/entry-form.vue
+++ b/app/components/app/employee/entry-form.vue
@@ -18,26 +18,26 @@ const data = computed({
     <div class="mb-5 border-b border-b-slate-300 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Nomor Induk Pegawai</Label>
+          <FieldGroup :column="2">
+            <Label>Nomor Induk Pegawai</Label>
             <Field>
               <Input v-model="data.number" />
             </Field>
           </FieldGroup>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Status</Label>
+          <FieldGroup :column="2">
+            <Label>Status</Label>
             <Field>
               <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
             </Field>
           </FieldGroup>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Position</Label>
+          <FieldGroup :column="2">
+            <Label>Position</Label>
             <Field>
               <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
             </Field>
           </FieldGroup>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Divisi</Label>
+          <FieldGroup :column="2">
+            <Label>Divisi</Label>
             <Field>
               <Select v-model="data.type" :items="items" placeholder="Pilih jenis" />
             </Field>
diff --git a/app/components/app/equipment/entry-form.vue b/app/components/app/equipment/entry-form.vue
index f54a8389..759f011d 100644
--- a/app/components/app/equipment/entry-form.vue
+++ b/app/components/app/equipment/entry-form.vue
@@ -2,14 +2,10 @@
 // types
 import type z from 'zod'
 import type { MaterialFormData } from '~/schemas/material'
-<<<<<<< HEAD:app/components/app/equipment/entry-form.vue
-=======
 // helpers
 import { toTypedSchema } from '@vee-validate/zod'
 import { useForm } from 'vee-validate'
 // components
-import Label from '~/components/pub/custom-ui/form/label.vue'
->>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/components/app/material/entry-form.vue
 
 interface Props {
   schema: z.ZodSchema<any>
diff --git a/app/components/app/laborant/entry-form.vue b/app/components/app/laborant/entry-form.vue
index 2a190160..4bf7bc68 100644
--- a/app/components/app/laborant/entry-form.vue
+++ b/app/components/app/laborant/entry-form.vue
@@ -18,8 +18,8 @@ const data = computed({
     <div class="mb-2 border-b border-b-slate-300 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup layout="stacked">
-            <Label stacked>No. IHS</Label>
+          <FieldGroup>
+            <Label>No. IHS</Label>
             <Field>
               <Input />
             </Field>
diff --git a/app/components/app/nurse/entry-form.vue b/app/components/app/nurse/entry-form.vue
index 2a190160..4bf7bc68 100644
--- a/app/components/app/nurse/entry-form.vue
+++ b/app/components/app/nurse/entry-form.vue
@@ -18,8 +18,8 @@ const data = computed({
     <div class="mb-2 border-b border-b-slate-300 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup layout="stacked">
-            <Label stacked>No. IHS</Label>
+          <FieldGroup>
+            <Label>No. IHS</Label>
             <Field>
               <Input />
             </Field>
diff --git a/app/components/app/nutritionist/entry-form.vue b/app/components/app/nutritionist/entry-form.vue
index 2a190160..4bf7bc68 100644
--- a/app/components/app/nutritionist/entry-form.vue
+++ b/app/components/app/nutritionist/entry-form.vue
@@ -18,8 +18,8 @@ const data = computed({
     <div class="mb-2 border-b border-b-slate-300 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup layout="stacked">
-            <Label stacked>No. IHS</Label>
+          <FieldGroup>
+            <Label>No. IHS</Label>
             <Field>
               <Input />
             </Field>
diff --git a/app/components/app/pharmacist/entry-form.vue b/app/components/app/pharmacist/entry-form.vue
index 17f2f2b4..5dbe9bb0 100644
--- a/app/components/app/pharmacist/entry-form.vue
+++ b/app/components/app/pharmacist/entry-form.vue
@@ -18,8 +18,8 @@ const data = computed({
     <div class="mb-2 border-b border-b-slate-300 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>No. IHS</Label>
+          <FieldGroup :column="2">
+            <Label>No. IHS</Label>
             <Field>
               <Input />
             </Field>
diff --git a/app/components/app/user/entry-form.vue b/app/components/app/user/entry-form.vue
index 202a494e..8e2f9a6b 100644
--- a/app/components/app/user/entry-form.vue
+++ b/app/components/app/user/entry-form.vue
@@ -18,14 +18,14 @@ const data = computed({
     <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
       <div class="flex flex-col justify-between">
         <Block>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Username</Label>
+          <FieldGroup :column="2">
+            <Label>Username</Label>
             <Field>
               <Input v-model="data.name" />
             </Field>
           </FieldGroup>
-          <FieldGroup :column="2" layout="stacked">
-            <Label stacked>Password</Label>
+          <FieldGroup :column="2">
+            <Label>Password</Label>
             <Field>
               <Input v-model="data.password" type="password" />
             </Field>
diff --git a/app/components/flow/employee/entry.vue b/app/components/content/employee/entry.vue
similarity index 79%
rename from app/components/flow/employee/entry.vue
rename to app/components/content/employee/entry.vue
index 774cf9b4..509baad0 100644
--- a/app/components/flow/employee/entry.vue
+++ b/app/components/content/employee/entry.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
+import { MaterialSchema, type MaterialFormData } from '~/schemas/material'
 
 const data = ref({
   name: '',
@@ -38,6 +39,11 @@ const items = [
 
   <AppEmployeeEntryForm v-model="data" :items="items" />
 
+  <AppPersonEntryForm v-model="data" :items="items" :schema="MaterialSchema" />
+  <AppPersonAddressEntryForm v-model="data" :items="items" :schema="MaterialSchema" />
+  <AppPersonContactEntryForm v-model="data" :items="items" :schema="MaterialSchema" />
+  <AppPersonRelativeEntryForm v-model="data" :items="items" :schema="MaterialSchema" />
+
   <AppDoctorEntryForm v-if="data.type === 'doctor'" v-model="data" />
   <AppNurseEntryForm v-else-if="data.type === 'nurse'" v-model="data" />
   <AppPharmacistEntryForm v-else-if="data.type === 'pharmacist'" v-model="data" />
diff --git a/app/components/flow/employee/list.vue b/app/components/content/employee/list.vue
similarity index 100%
rename from app/components/flow/employee/list.vue
rename to app/components/content/employee/list.vue
diff --git a/app/pages/(features)/human-src/employee/add.vue b/app/pages/(features)/human-src/employee/add.vue
index 8478c9b2..b615504e 100644
--- a/app/pages/(features)/human-src/employee/add.vue
+++ b/app/pages/(features)/human-src/employee/add.vue
@@ -35,7 +35,7 @@ const canCreate = hasCreateAccess(roleAccess)
 
 <template>
   <div v-if="canCreate">
-    <ContentUserEntry />
+    <ContentEmployeeEntry />
   </div>
   <Error v-else :status-code="403" />
 </template>