diff --git a/app/components/Admin/AdminDatePicker.vue b/app/components/Admin/AdminDatePicker.vue
index 5053b75..95aa9bf 100644
--- a/app/components/Admin/AdminDatePicker.vue
+++ b/app/components/Admin/AdminDatePicker.vue
@@ -169,7 +169,7 @@ const emit = defineEmits(['update:modelValue', 'change'])
 const dateSelector = ref(null)
 const isFirstDateVisible = ref(false)
 const isLastDateVisible = ref(false)
-const dateRange = ref({ start: -15, end: 15 })
+const dateRange = ref({ start: -8, end: 10 })
 const showCalendar = ref(false)
 
 const pad = (n) => n.toString().padStart(2, '0')
@@ -248,7 +248,7 @@ const scrollToDateElement = (behavior = 'smooth') => {
 const handleWheel = (event) => {
   event.preventDefault()
   if (!dateSelector.value) return
-  const scrollAmount = 200
+  const scrollAmount = 120
   const currentScroll = dateSelector.value.scrollLeft
   dateSelector.value.scrollTo({
     left: event.deltaY > 0 ? currentScroll + scrollAmount : currentScroll - scrollAmount,
@@ -258,7 +258,7 @@ const handleWheel = (event) => {
 
 const scrollDates = (direction) => {
   if (!dateSelector.value) return
-  const scrollAmount = 200
+  const scrollAmount = 120
   const currentScroll = dateSelector.value.scrollLeft
   dateSelector.value.scrollTo({
     left: direction === 'right' ? currentScroll + scrollAmount : currentScroll - scrollAmount,
@@ -271,14 +271,14 @@ const handleScroll = () => {
   const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value
   if (scrollLeft < 50) {
     const oldScrollWidth = scrollWidth
-    dateRange.value.start -= 7
+    dateRange.value.start -= 3
     nextTick(() => {
       const newScrollWidth = dateSelector.value.scrollWidth
       dateSelector.value.scrollLeft += newScrollWidth - oldScrollWidth
     })
   }
   if (scrollWidth - scrollLeft - clientWidth < 50) {
-    dateRange.value.end += 7
+    dateRange.value.end += 3
   }
 }
 
@@ -286,8 +286,8 @@ const scrollToToday = () => {
   const todayStr = formatDateStr(today)
   if (props.modelValue !== todayStr) selectDate(todayStr)
   if (dateRange.value.start > 0 || dateRange.value.end < 0) {
-    dateRange.value.start = -15
-    dateRange.value.end = 15
+    dateRange.value.start = -8
+    dateRange.value.end = 10
   }
   nextTick(() => scrollToDateElement('smooth'))
 }
@@ -312,8 +312,8 @@ const handleQuickSelect = (dateValue) => {
     const d = new Date(dateValue)
     const diffDays = Math.round((d - today) / (1000 * 60 * 60 * 24))
     if (diffDays < dateRange.value.start || diffDays > dateRange.value.end) {
-      dateRange.value.start = diffDays - 5
-      dateRange.value.end = diffDays + 10
+      dateRange.value.start = diffDays - 3
+      dateRange.value.end = diffDays + 5
     }
     nextTick(() => scrollToDateElement('smooth'))
   })
diff --git a/app/components/Admin/AdminMultiDatePicker.vue b/app/components/Admin/AdminMultiDatePicker.vue
index 0fc0140..035a711 100644
--- a/app/components/Admin/AdminMultiDatePicker.vue
+++ b/app/components/Admin/AdminMultiDatePicker.vue
@@ -191,7 +191,7 @@ const emit = defineEmits(['update:modelValue', 'change'])
 const dateSelector = ref(null)
 const isFirstDateVisible = ref(false)
 const isLastDateVisible = ref(false)
-const dateRange = ref({ start: 0, end: 45 })
+const dateRange = ref({ start: 0, end: 28 })
 const showCalendar = ref(false)
 const lastClickedDate = ref('')
 
@@ -343,7 +343,7 @@ const applyBatchAction = (action) => {
 const handleWheel = (event) => {
   event.preventDefault()
   if (!dateSelector.value) return
-  const scrollAmount = 200
+  const scrollAmount = 120
   const currentScroll = dateSelector.value.scrollLeft
   dateSelector.value.scrollTo({
     left: event.deltaY > 0 ? currentScroll + scrollAmount : currentScroll - scrollAmount,
@@ -353,7 +353,7 @@ const handleWheel = (event) => {
 
 const scrollDates = (direction) => {
   if (!dateSelector.value) return
-  const scrollAmount = 200
+  const scrollAmount = 120
   const currentScroll = dateSelector.value.scrollLeft
   dateSelector.value.scrollTo({
     left: direction === 'right' ? currentScroll + scrollAmount : currentScroll - scrollAmount,
@@ -364,23 +364,23 @@ const scrollDates = (direction) => {
 const handleScroll = () => {
   if (!dateSelector.value) return
   const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value
-  if (scrollLeft < 50) {
+  if (scrollLeft < 50 && dateRange.value.start > 0) {
     const oldScrollWidth = scrollWidth
-    dateRange.value.start -= 7
+    dateRange.value.start = Math.max(0, dateRange.value.start - 3)
     nextTick(() => {
       const newScrollWidth = dateSelector.value.scrollWidth
       dateSelector.value.scrollLeft += newScrollWidth - oldScrollWidth
     })
   }
   if (scrollWidth - scrollLeft - clientWidth < 50) {
-    dateRange.value.end += 7
+    dateRange.value.end += 3
   }
 }
 
 const scrollToToday = () => {
   if (dateRange.value.start > 0 || dateRange.value.end < 0) {
     dateRange.value.start = 0
-    dateRange.value.end = 30
+    dateRange.value.end = 20
   }
   nextTick(() => {
     if (!dateSelector.value) return