diff --git a/index.html b/index.html
index de8acc5..0e3d5d4 100644
--- a/index.html
+++ b/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>ระบบทรัพยากรบุคคล</title>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>ระบบบริหารทรัพยากรบุคคล</title>
   </head>
   <body>
     <div id="app"></div>
diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue
index d10b6cc..793ca98 100644
--- a/src/modules/01_dashboard/views/Dashboard.vue
+++ b/src/modules/01_dashboard/views/Dashboard.vue
@@ -224,7 +224,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
         สวัสดี, {{ fullname }}
       </div>
       <div style="color: #ffffff" class="text-18px text-weight-medium col-12">
-        ระบบทรัพยากรบุคคล
+        ระบบบริหารทรัพยากรบุคคลของกรุงเทพมหานคร
       </div>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-9">
diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 24f4e2a..f8de050 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -12,6 +12,8 @@ import type {
   FromCancelDetail,
 } from "@/modules/05_leave/interface/response/leave";
 
+import DialogHeader from "@/components/DialogHeader.vue";
+
 /** import componest*/
 import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
 import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
@@ -433,34 +435,15 @@ watch(
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card q-card style="min-width: 70%" v-if="props.leaveStatus != 'DELETE'">
-      <q-card-section class="row items-center q-pa-sm">
-		<q-toolbar style="padding: 0px;">
-			<q-toolbar-title class="text-bold" style="font-size: 15px;"> {{ titleMain }}{{ titleName }} </q-toolbar-title>
-  
-			<q-btn
-			  icon="close"
-			  unelevated
-			  round
-			  dense
-			  @click="props.onClickClose"
-			  style="color: #ff8080; background-color: #ffdede"
-			/>
-		  </q-toolbar>
-		
-        <!-- <div class="text-bold q-pl-sm">{{ titleMain }}{{ titleName }}</div>
-        <q-space />
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="props.onClickClose"
-          style="color: #ff8080; background-color: #ffdede"
-        /> -->
-      </q-card-section>
+    <q-card v-if="props.leaveStatus != 'DELETE'">
+      <DialogHeader
+        :tittle="`${titleMain} ${titleName}`"
+        :close="props.onClickClose"
+      />
+
       <q-separator />
-      <q-card-section class="q-pa-sm row q-gutter-y-md">
+
+      <q-card-section class="scroll" style="max-height: 70vh">
         <div
           flat
           :class="
@@ -560,10 +543,7 @@ watch(
         </div>
       </q-card-section>
       <q-separator />
-      <q-card-section
-        class="row items-center q-pa-sm"
-        v-if="props.leaveStatus === 'CANCEL'"
-      >
+      <q-card-section v-if="props.leaveStatus === 'CANCEL'" align="right">
         <q-space />
         <q-btn
           label="ยืนยัน"
@@ -576,21 +556,12 @@ watch(
       </q-card-section>
     </q-card>
 
-    <q-card q-card style="min-width: 70%" v-if="props.leaveStatus === 'DELETE'">
-      <q-card-section class="row items-center q-pa-sm">
-        <div class="text-bold q-pl-sm">
-          {{ titleMainCancle }}{{ titleName }}
-        </div>
-        <q-space />
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          @click="props.onClickClose"
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-card-section>
+    <q-card q-card v-if="props.leaveStatus === 'DELETE'">
+      <DialogHeader
+        :tittle="`${titleMainCancle} ${titleName}`"
+        :close="props.onClickClose"
+      />
+
       <q-separator />
       <q-card-section class="q-p-md row q-gutter-y-md">
         <div flat class="col-12">
diff --git a/src/modules/09_scholarship/components/Dialog/DialogReturn.vue b/src/modules/09_scholarship/components/Dialog/DialogReturn.vue
index 68bc4f5..e821f8e 100644
--- a/src/modules/09_scholarship/components/Dialog/DialogReturn.vue
+++ b/src/modules/09_scholarship/components/Dialog/DialogReturn.vue
@@ -58,8 +58,10 @@ function onSubmit() {
           governmentDate: governmentDate.value,
           governmentEndDate: governmentEndDate.value,
           isGraduated: isGraduated.value,
-          graduatedDate: isGraduated.value == 'true' ? graduatedDate.value : null,
-          graduatedReason: isGraduated.value == 'false' ? graduatedReason.value : null,
+          graduatedDate:
+            isGraduated.value == "true" ? graduatedDate.value : null,
+          graduatedReason:
+            isGraduated.value == "false" ? graduatedReason.value : null,
         })
         .then((res) => {
           success($q, "บันทึกสำเร็จ");
@@ -110,7 +112,7 @@ watch(
         <q-separator />
         <q-card-section>
           <div class="row q-col-gutter-sm">
-            <div class="col-6">
+            <div class="col-xs-12 col-sm-12 col-md-6">
               <q-input
                 label="เลขที่หนังสือรายงานตัวกลับเข้าปฏิบัติราชการ"
                 v-model="bookNumber"
@@ -125,7 +127,7 @@ watch(
                 class="inputgreen"
               />
             </div>
-            <div class="col-6">
+            <div class="col-xs-12 col-sm-12 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="bookDate"
@@ -163,7 +165,7 @@ watch(
                 </template>
               </datepicker>
             </div>
-            <div class="col-6">
+            <div class="col-xs-12 col-sm-12 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="governmentDate"
@@ -203,7 +205,7 @@ watch(
                 </template>
               </datepicker>
             </div>
-            <div class="col-6">
+            <div class="col-xs-12 col-sm-12 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
                 v-model="governmentEndDate"
@@ -305,8 +307,8 @@ watch(
                 dense
                 outlined
                 hide-bottom-space
-                    class="inputgreen"
-                    :rules="[
+                class="inputgreen"
+                :rules="[
                             (val:string) =>
                                 !!val || `${'กรุณากรอก เนื่องจาก'}`,
                             ]"
diff --git a/src/modules/09_scholarship/views/detail.vue b/src/modules/09_scholarship/views/detail.vue
index 08347a0..b105760 100644
--- a/src/modules/09_scholarship/views/detail.vue
+++ b/src/modules/09_scholarship/views/detail.vue
@@ -522,7 +522,7 @@ onMounted(async () => {
             </div>
 
             <q-space />
-            <div v-if="fileList == null" class="col-xs-5 col-3">
+            <div v-if="fileList == null" class="col-xs-8 col-sm-3">
               <q-file
                 for="inputFiles"
                 class="col-12"
diff --git a/src/modules/10_registry/01_Information/01_Information.vue b/src/modules/10_registry/01_Information/01_Information.vue
index 72e0576..3c7a9b5 100644
--- a/src/modules/10_registry/01_Information/01_Information.vue
+++ b/src/modules/10_registry/01_Information/01_Information.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableColumn, type QTableProps } from "quasar";
-import { ref, reactive,onMounted } from "vue";
+import { ref, reactive, onMounted } from "vue";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
 
 //history dialog
@@ -11,7 +11,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 const store = useRegistryInFormationStore();
-const rowsHistory = ref<any[]>([])
+const rowsHistory = ref<any[]>([]);
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError, date2Thai } = mixin;
@@ -222,7 +222,6 @@ const visibleColumnsHistory = ref<string[]>([
   "createdAt",
 ]);
 
-
 function onHistory() {
   modalHistory.value = true;
 }
@@ -258,7 +257,10 @@ function getData() {
 
 /** get history */
 function getHistory() {
-  const url = store.typeProfile == 'OFFICER' ? config.API.dataUserInformatioHistory(''):config.API.dataUserInformatioHistory('-employee')
+  const url =
+    store.typeProfile == "OFFICER"
+      ? config.API.dataUserInformatioHistory("")
+      : config.API.dataUserInformatioHistory("-employee");
   showLoader();
   http
     .get(url)
diff --git a/src/modules/10_registry/Dialog/DialogHistory.vue b/src/modules/10_registry/Dialog/DialogHistory.vue
index e3dd120..9fb7592 100644
--- a/src/modules/10_registry/Dialog/DialogHistory.vue
+++ b/src/modules/10_registry/Dialog/DialogHistory.vue
@@ -65,10 +65,10 @@ watch(
 </script>
 <template>
   <q-dialog v-model="modal" persistent>
-    <q-card style="min-width: 70vw">
+    <q-card>
       <DialogHeader :tittle="title" :close="close" />
       <q-separator />
-      <q-card-section>
+      <q-card-section style="max-height: 80vh" class="scroll">
         <div class="row justify-end q-col-gutter-sm q-mb-sm">
           <div class="col-12 col-sm-3">
             <q-input
@@ -209,7 +209,9 @@ watch(
                       class="fix_top"
                     >
                       <q-item-label class="text-dark text-weight-medium">
-                        {{ props.row.status ? statusLeave(props.row.status) : "-" }}</q-item-label
+                        {{
+                          props.row.status ? statusLeave(props.row.status) : "-"
+                        }}</q-item-label
                       >
                     </q-item-section>
                     <q-item-section v-else class="fix_top">
diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue
index 182d11a..76694af 100644
--- a/src/modules/10_registry/views/main.vue
+++ b/src/modules/10_registry/views/main.vue
@@ -21,7 +21,7 @@ import { useQuasar } from "quasar";
 const store = useRegistryInFormationStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { messageError,dialogConfirm } = mixin;
+const { messageError, dialogConfirm } = mixin;
 const profileImg = ref<string>("");
 const router = useRouter();
 const tab = ref<string>("information");
@@ -100,7 +100,7 @@ function onClickDownloadKp7(type: string) {
  * logout keycloak
  * confirm ก่อนออกจากระบบ
  */
- const doLogout = () => {
+const doLogout = () => {
   dialogConfirm(
     $q,
     () => {
@@ -332,6 +332,12 @@ onMounted(async () => {
                 <q-avatar text-color="info" icon="mdi-chevron-right" />
               </q-item-section>
             </q-item>
+            <q-item clickable v-ripple disabled>
+              <q-item-section>เปลี่ยนรหัสผ่าน</q-item-section>
+              <q-item-section avatar>
+                <q-avatar text-color="info" icon="mdi-chevron-right" />
+              </q-item-section>
+            </q-item>
           </q-list>
         </q-card>
       </div>
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 476b933..0bf4824 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -7,7 +7,6 @@ import { useQuasar } from "quasar";
 import keycloak from "@/plugins/keycloak";
 import { useCounterMixin } from "@/stores/mixin";
 
-
 const route = useRoute();
 const router = useRouter();
 
@@ -154,8 +153,8 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
   minute: "2-digit",
 };
 
-function onInfo(){
-  router.push(`/registry`)
+function onInfo() {
+  router.push(`/registry`);
 }
 </script>
 <!-- โครงเว็บ -->
@@ -178,9 +177,9 @@ function onInfo(){
               style="color: #ffffff; letter-spacing: 1px; line-height: 10px"
               class="text-body2 text-weight-bolder col-12"
             >
-              ระบบ<span class="text-primary">ทรัพยากรบุคคล</span>
+              ระบบ<span class="text-primary">บริหารทรัพยากรบุคคล</span>
             </div>
-            <div class="text-caption text-white">กรุงเทพมหานคร</div>
+            <div class="text-caption text-white">ของกรุงเทพมหานคร</div>
           </div>
         </div>
         <div v-else class="row items-center">
@@ -364,11 +363,17 @@ function onInfo(){
           </template>
           <q-list>
             <q-item clickable v-close-popup @click="onInfo">
-              <q-item-section avatar style="min-width: 30px" >
-                <q-icon color="info" size="18px" name="mdi-clipboard-account-outline" />
+              <q-item-section avatar style="min-width: 30px">
+                <q-icon
+                  color="blue-9"
+                  size="18px"
+                  name="mdi-clipboard-account-outline"
+                />
               </q-item-section>
               <q-item-section
-                ><q-item-label>ข้อมูลทะเบียนประวัติ</q-item-label></q-item-section
+                ><q-item-label
+                  >ข้อมูลทะเบียนประวัติ</q-item-label
+                ></q-item-section
               >
             </q-item>
 
@@ -402,9 +407,8 @@ function onInfo(){
                 style="height: 30px; max-width: 30px"
               />
             </q-avatar>
-            <q-menu>
+            <!-- <q-menu>
               <q-list dense style="min-width: 200px">
-                
                 <q-item clickable v-close-popup>
                   <q-item-section>
                     <div class="row items-center">
@@ -412,7 +416,7 @@ function onInfo(){
                         <q-item clickable v-close-popup @click="onInfo">
                           <q-item-section avatar style="min-width: 30px">
                             <q-icon
-                              color="info"
+                              color="blue-9"
                               size="18px"
                               name="mdi-clipboard-account-outline"
                             />
@@ -455,7 +459,7 @@ function onInfo(){
                   </q-item-section>
                 </q-item>
               </q-list>
-            </q-menu>
+            </q-menu> -->
           </q-btn>
         </div>
       </q-toolbar>
@@ -490,7 +494,13 @@ function onInfo(){
             icon="mdi-calendar-blank-outline"
             @click="router.push(`/leave`)"
           />
-          <q-btn flat round color="white" icon="mdi-account-outline" />
+          <q-btn
+            flat
+            round
+            color="white"
+            icon="mdi-account-outline"
+            @click="router.push(`/registry`)"
+          />
         </div>
       </q-toolbar>
     </q-footer>
