diff --git a/Display/src/app/components/dashboard/dashboard.component.html b/Display/src/app/components/dashboard/dashboard.component.html
index 9d5edd2..568c3b7 100644
--- a/Display/src/app/components/dashboard/dashboard.component.html
+++ b/Display/src/app/components/dashboard/dashboard.component.html
@@ -1,4 +1,4 @@
-<div class="content">
+<div class="main">
     <header class="header">
         <button mat-stroked-button (click)="toggleLocked()" *ngIf="!locked">
             <mat-icon>lock_open</mat-icon>
@@ -9,23 +9,35 @@
             Locked
         </button>
     </header>
-    <gridster [options]="options">
+    <gridster class="content" [options]="options">
         <gridster-item [item]="dashboard[0]">
-            <div class="dashboard-item-header">Weather</div>
-            <div class="dashboard-item-content">
-                <app-weather-current></app-weather-current>
+            <div class="dashboard-item">
+                <div class="dashboard-item-header">
+                    Weather
+                </div>
+                <div class="dashboard-item-content">
+                    <app-weather-current></app-weather-current>
+                </div>
             </div>
         </gridster-item>
         <gridster-item [item]="dashboard[1]">
-            <div class="dashboard-item-header">Laundry</div>
-            <div class="dashboard-item-content">
-                <app-laundry></app-laundry>
+            <div class="dashboard-item">
+                <div class="dashboard-item-header">
+                    Laundry
+                </div>
+                <div class="dashboard-item-content">
+                    <app-laundry></app-laundry>
+                </div>
             </div>
         </gridster-item>
         <gridster-item [item]="dashboard[2]">
-            <div class="dashboard-item-header">Pressure Trend</div>
-            <div class="dashboard-item-content">
-                <app-pressure-trend></app-pressure-trend>
+            <div class="dashboard-item">
+                <div class="dashboard-item-header">
+                    Pressure Trend
+                </div>
+                <div class="dashboard-item-content">
+                    <app-pressure-trend></app-pressure-trend>
+                </div>
             </div>
         </gridster-item>
     </gridster>
diff --git a/Display/src/app/components/dashboard/dashboard.component.scss b/Display/src/app/components/dashboard/dashboard.component.scss
index 18f0de8..b0c7ee8 100644
--- a/Display/src/app/components/dashboard/dashboard.component.scss
+++ b/Display/src/app/components/dashboard/dashboard.component.scss
@@ -1,9 +1,4 @@
-gridster {
-  background: #fafafa;
-  flex: 1 1 auto;
-}
-
-.content {
+.main {
   display: flex;
   flex-flow: column;
   height: 100%;
@@ -16,13 +11,25 @@ gridster {
   text-align: right;
 }
 
+.content {
+  background: #fafafa;
+  flex: 1 1 auto;
+}
+
+.dashboard-item {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
 .dashboard-item-header {
   color: white;
   background-color: #673ab7;
   padding: 10px;
+  flex: 0 0 auto;
 }
 
 .dashboard-item-content {
-    border: 1px solid lightgray;
-    height: calc(100% - 41px);
+  border: 1px solid lightgray;
+  flex: 1 1 auto;
 }