diff --git a/src/components/AscGISMapTime.vue b/src/components/AscGISMapTime.vue
index 6a66581..7360980 100644
--- a/src/components/AscGISMapTime.vue
+++ b/src/components/AscGISMapTime.vue
@@ -356,12 +356,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <q-card
-    bordered
-    flat
-    class="col-12 bg-grey-2 shadow-0"
-    :style="$q.screen.gt.xs ? ';' : 'border-radius: 20px'"
-  >
+  <q-card bordered flat class="col-12 bg-grey-2 shadow-0">
     <div id="mapViewDisplay" style="height: 35vh"></div>
 
     <div
diff --git a/src/components/FormTime.vue b/src/components/FormTime.vue
index cf9a71f..a622a13 100644
--- a/src/components/FormTime.vue
+++ b/src/components/FormTime.vue
@@ -192,7 +192,11 @@ onMounted(() => {
 </script>
 
 <template>
-  <q-card-section :horizontal="$q.screen.gt.md" style="padding: 0px">
+  <q-card-section
+    :horizontal="$q.screen.gt.md"
+    style="max-height: 65vh; padding: 0px"
+    class="scroll"
+  >
     <div class="col-12">
       <div class="row q-col-q-gutter-sm">
         <div class="q-pa-md col-md-5 col-xs-12">
@@ -202,7 +206,7 @@ onMounted(() => {
             :class="$q.screen.gt.xs ? 'col-12 bg-grey-1' : 'col-12 '"
           >
             <q-card-section class="bg-primary text-white q-pa-sm">
-              <div class="text-center text-bold">เวลาปัจจุบัน</div>
+              <div class="text-center text-bold">เวลาปัจasdasdasจุบัน</div>
             </q-card-section>
 
             <q-card-section class="text-center q-pa-sm">
@@ -320,25 +324,25 @@ onMounted(() => {
           </q-card>
         </div>
         <q-separator vertical />
-        <div class="q-pa-md col">
-          <div class="row q-col-gutter-sm">
-            <q-card flat bordered class="q-pa-sm col-12 q-mt-sm">
-              <MapCheck @update:location="updateLocation" />
-            </q-card>
-          </div>
+
+        <div
+          class="q-pa-md col"
+          :style="!$q.screen.gt.sm ? 'padding-top: 0;' : ''"
+        >
+          <q-card flat bordered class="col-12">
+            <MapCheck @update:location="updateLocation" />
+          </q-card>
         </div>
 
         <!-- :style="action == 'special' ? 'margin-bottom: 120px' : ''" -->
       </div>
     </div>
   </q-card-section>
-  <div class="col-12">
-    <div class="col-12"><q-separator /></div>
-    <div class="row col-12 q-pa-sm">
-      <q-space />
-      <q-btn color="secondary" label="บันทึก" @click="onCkickSave" />
-    </div>
-  </div>
+
+  <q-separator />
+  <q-card-actions align="right">
+    <q-btn color="secondary" label="บันทึก" @click="onCkickSave" />
+  </q-card-actions>
 </template>
 
 <style scoped></style>
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index 6cd2e98..264af71 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -42,6 +42,7 @@ async function changePage(pageVal: number, pageSizeVal: number, key: string) {
  * ฟังก์ชันสำหรับดึงข้อมูลตามประเภทแท็บที่เลือก
  */
 async function functionFetch() {
+  stores.rows = []
   stores.tab === 'history' ? await fetchlistHistory() : await fetchlistTime()
 }