diff --git a/src/v2/core/DateService.ts b/src/v2/core/DateService.ts
index 469fbdb..142372c 100644
--- a/src/v2/core/DateService.ts
+++ b/src/v2/core/DateService.ts
@@ -14,7 +14,7 @@ export class DateService {
 
   getWeekDates(offset = 0): string[] {
     const monday = dayjs().startOf('week').add(1, 'day').add(offset, 'week');
-    return Array.from({ length: 5 }, (_, i) =>
+    return Array.from({ length: 7 }, (_, i) =>
       monday.add(i, 'day').format('YYYY-MM-DD')
     );
   }
diff --git a/wwwroot/css/calendar-v2.css b/wwwroot/css/calendar-v2.css
index 685b468..bbed094 100644
--- a/wwwroot/css/calendar-v2.css
+++ b/wwwroot/css/calendar-v2.css
@@ -160,7 +160,8 @@ swp-content-track > swp-scrollable-content {
 /* Header */
 swp-calendar-header {
   display: grid;
-  grid-template-columns: repeat(var(--grid-columns), 1fr);
+  grid-template-columns: repeat(var(--grid-columns), minmax(var(--day-column-min-width), 1fr));
+  min-width: calc(var(--grid-columns) * var(--day-column-min-width));
   grid-auto-rows: auto;
   background: var(--color-surface);
   overflow-y: scroll;
@@ -227,6 +228,7 @@ swp-time-grid {
   display: block;
   position: relative;
   min-height: calc((var(--day-end-hour) - var(--day-start-hour)) * var(--hour-height));
+  min-width: calc(var(--grid-columns) * var(--day-column-min-width));
 }
 
 /* Timelinjer via ::after */
@@ -274,7 +276,8 @@ swp-day-columns {
   position: absolute;
   inset: 0;
   display: grid;
-  grid-template-columns: repeat(var(--grid-columns), 1fr);
+  grid-template-columns: repeat(var(--grid-columns), minmax(var(--day-column-min-width), 1fr));
+  min-width: calc(var(--grid-columns) * var(--day-column-min-width));
 }
 
 swp-day-column {