diff --git a/src/modules/02_users/views/01_user.vue b/src/modules/02_users/views/01_user.vue
index 82239a2e..08da0e36 100644
--- a/src/modules/02_users/views/01_user.vue
+++ b/src/modules/02_users/views/01_user.vue
@@ -152,8 +152,8 @@ const itemMenu = ref<ItemsMenu[]>([
 ]);
 
 const employeeClassMain = ref<DataOption[]>([
-  { id: "officer", name: "ข้าราชการกรุงเทพมหานครสามัญ" },
-  { id: "employee", name: "ลูกจ้างประจำกรุงเทพมหานคร" },
+  { id: "officer", name: "ข้าราชการ กทม.สามัญ" },
+  { id: "employee", name: "ลูกจ้างประจำ" },
 ]);
 
 const employeeClassOption = ref<DataOption[]>(employeeClassMain.value);
diff --git a/src/modules/02_users/views/04_roleOrganization.vue b/src/modules/02_users/views/04_roleOrganization.vue
index 4f45f5ed..4683c5ff 100644
--- a/src/modules/02_users/views/04_roleOrganization.vue
+++ b/src/modules/02_users/views/04_roleOrganization.vue
@@ -310,23 +310,9 @@ onMounted(async () => {
           <div class="col-12"><q-separator /></div>
           <q-card-section>
             <div class="row col-12 q-col-md">
-              <div class="col-2">
-                <q-btn
-                  v-if="orgId"
-                  flat
-                  dense
-                  color="primary"
-                  icon="add"
-                  round
-                  @click="modalAdd = true"
-                >
-                  <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-                </q-btn>
-              </div>
-
               <div class="col-md-10">
                 <div class="row col-12 q-col-gutter-sm">
-                  <div class="col-md-4">
+                  <div class="col-md-3">
                     <q-select
                       outlined
                       dense
@@ -339,7 +325,7 @@ onMounted(async () => {
                       option-value="id"
                     />
                   </div>
-                  <div class="col-md-6">
+                  <div class="col-md-5">
                     <q-input
                       v-model="qureyBody.searchKeyword"
                       outlined
@@ -358,7 +344,7 @@ onMounted(async () => {
                       </template>
                     </q-input>
                   </div>
-                  <div class="row col-md-2">
+                  <div>
                     <q-btn
                       color="primary"
                       icon="search"
@@ -372,6 +358,18 @@ onMounted(async () => {
             </div>
 
             <div class="row col-12 q-mt-sm">
+              <q-btn
+                v-if="orgId"
+                flat
+                dense
+                color="primary"
+                icon="add"
+                round
+                @click="modalAdd = true"
+              >
+                <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+              </q-btn>
+
               <q-space />
               <q-select
                 v-model="visibleColumns"
diff --git a/src/modules/05_command/views/lists.vue b/src/modules/05_command/views/lists.vue
index b1990c4c..93986e71 100644
--- a/src/modules/05_command/views/lists.vue
+++ b/src/modules/05_command/views/lists.vue
@@ -314,7 +314,7 @@ onMounted(async () => {
                   dense
                   @click="onDialogEdit(item)"
                 />
-                <q-tooltip>แก้ไข</q-tooltip>
+                <q-tooltip>แก้ไขข้อมูล</q-tooltip>
               </q-item-section>
             </q-item>
           </q-list>