diff --git a/src/components/01_branch-management/FormLocation.vue b/src/components/01_branch-management/FormLocation.vue
index f4fb7368..619917e5 100644
--- a/src/components/01_branch-management/FormLocation.vue
+++ b/src/components/01_branch-management/FormLocation.vue
@@ -32,7 +32,7 @@ defineProps<{
     </div>
 
     <div class="col-12 bordered rounded column">
-      <div class="q-pl-md q-py-sm app-text-muted bordered-b">location</div>
+      <!-- <div class="q-pl-md q-py-sm app-text-muted bordered-b">location</div> -->
 
       <div v-if="!!longitude && !!latitude" class="col flex flex-center">
         <iframe
@@ -54,7 +54,7 @@ defineProps<{
           background-repeat: no-repeat;
         "
       >
-        <q-btn
+        <!-- <q-btn
           :text-color="$q.dark.isActive ? 'black' : 'white'"
           style="
             background: var(--blue-5);
@@ -67,8 +67,26 @@ defineProps<{
           :label="$t('branch.form.shareLocation')"
           @click="getLocation()"
           id="btn-get-location"
-        />
+        /> -->
       </div>
     </div>
+    <div class="row full-width q-pt-sm">
+      <q-input
+        v-model="latitude"
+        :readonly="readonly"
+        :outlined="outlined"
+        :dense="dense"
+        :label="$t('branch.form.latitude')"
+        class="col q-mr-xs"
+      />
+      <q-input
+        v-model="longitude"
+        :readonly="readonly"
+        :outlined="outlined"
+        :dense="dense"
+        :label="$t('branch.form.longitude')"
+        class="col q-ml-xs"
+      />
+    </div>
   </div>
 </template>
diff --git a/src/i18n/eng/index.ts b/src/i18n/eng/index.ts
index c57408d7..4b410662 100644
--- a/src/i18n/eng/index.ts
+++ b/src/i18n/eng/index.ts
@@ -202,6 +202,8 @@ export default {
       bankAccountNumber: 'Bank Account Number',
       bankAccountName: 'Bank Account Name',
       bankAccountType: 'Bank Account Type',
+      latitude: 'Latitude',
+      longitude: 'Longitude',
     },
   },
 
diff --git a/src/i18n/tha/index.ts b/src/i18n/tha/index.ts
index f3b76f29..f0d0aa57 100644
--- a/src/i18n/tha/index.ts
+++ b/src/i18n/tha/index.ts
@@ -202,6 +202,8 @@ export default {
       bankAccountNumber: 'เลขบัญชี',
       bankAccountName: 'ชื่อบัญชี',
       bankAccountType: 'ประเภทบัญชี',
+      latitude: 'ละติจูด',
+      longitude: 'ลองจิจูด',
     },
   },
 
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index f39e8886..3b52563f 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -1559,6 +1559,8 @@ watch(currentHq, () => {
           :separator="true"
           v-model:latitude="formData.latitude"
           v-model:longitude="formData.longitude"
+          outlined
+          dense
           title="branch.form.group.location"
         />
         <FormQr
@@ -1792,6 +1794,8 @@ watch(currentHq, () => {
               v-model:longitude="formData.longitude"
               :readonly="formType === 'view'"
               :separator="true"
+              outlined
+              dense
               class="q-mb-xl"
             />
             <FormQr