diff --git a/wwwroot/css/calendar-layout-css.css b/wwwroot/css/calendar-layout-css.css
index 9034a05..d11baa0 100644
--- a/wwwroot/css/calendar-layout-css.css
+++ b/wwwroot/css/calendar-layout-css.css
@@ -16,7 +16,7 @@
 swp-calendar {
   display: grid;
   grid-template-rows: auto 1fr;
-  height: calc(100vh - 20px);
+  height: 100vh;
   width: 100%;
   background: var(--color-background);
   position: relative;
@@ -39,10 +39,9 @@ swp-calendar-nav {
 swp-calendar-container {
   display: grid;
   grid-template-columns: 60px 1fr 20px;
-  grid-template-rows: auto 1fr 20px;
+  grid-template-rows: auto calc(1fr - 20px) 20px;
   overflow: hidden;
   position: relative;
-  height: 100%;
 }
 
 
@@ -73,8 +72,8 @@ swp-right-header-spacer {
 
 /* Week container for sliding */
 swp-week-container {
-  grid-column: 2; /* Only column 2, not spanning to column 3 */
-  grid-row: 1;
+  grid-column: 2 / 4; /* Span across columns 2-3 to include right spacer area */
+  grid-row: 1 / 3;
   display: grid;
   grid-template-rows: auto 1fr;
   position: relative;
@@ -96,7 +95,7 @@ swp-right-column {
 /* Time axis */
 swp-time-axis {
   grid-column: 1;
-  grid-row: 1 / 3;
+  grid-row: 2;
   background: var(--color-surface);
   border-right: 1px solid var(--color-border);
   position: sticky;
@@ -158,15 +157,6 @@ swp-bottom-middle-spacer {
   background: #f0f0f0;
   border-top: 2px solid #333;
   overflow: hidden;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  color: #333;
-}
-
-swp-bottom-middle-spacer::before {
-  content: "Row 3, Column 2 - TEST";
 }