diff --git a/src/modules/timesheet-approval/components/overview-report.vue b/src/modules/timesheet-approval/components/overview-report.vue
index a829fbb..ee2cf83 100644
--- a/src/modules/timesheet-approval/components/overview-report.vue
+++ b/src/modules/timesheet-approval/components/overview-report.vue
@@ -43,7 +43,7 @@ const onClickedDownload = async () => {
         const types = Object.entries(report_filter_options.value)
             .filter(([key, value]) => value && ['shifts', 'expenses', 'holiday', 'vacation'].includes(key)).map(([key]) => key).join('-');
 
-        const file_name = `Desjardins_${companies}_${types}_${new Date().toISOString().split('T')[0]}.csv`;
+        const file_name = `${companies}_${types}_${timesheet_store.pay_period?.pay_period_no}-${timesheet_store.pay_period?.pay_year}_${timesheet_store.pay_period?.period_start}-${timesheet_store.pay_period?.period_end}.csv`;
 
         const blob = new Blob([data], { type: 'text/csv;charset=utf-8;' });
         const url = window.URL.createObjectURL(blob);
diff --git a/src/modules/timesheets/components/shift-list.vue b/src/modules/timesheets/components/shift-list.vue
index f1f04b7..ef0cc42 100644
--- a/src/modules/timesheets/components/shift-list.vue
+++ b/src/modules/timesheets/components/shift-list.vue
@@ -101,7 +101,8 @@
         <div
             v-for="timesheet, timesheet_index of timesheet_store.timesheets"
             :key="timesheet.timesheet_id"
-            :class="$q.platform.is.mobile ? 'col-auto column no-wrap' : 'col column fit items-center'"
+            class="no-wrap"            
+            :class="$q.platform.is.mobile ? 'col-auto column' : 'col column fit items-center'"
         >
             <transition
                 appear