diff --git a/src/app/list/device-list/device-list.component.ts b/src/app/list/device-list/device-list.component.ts
index c5aef0f37..63e971f5e 100644
--- a/src/app/list/device-list/device-list.component.ts
+++ b/src/app/list/device-list/device-list.component.ts
@@ -6,7 +6,7 @@ import { MatTable } from '@angular/material/table';
 import { DeviceListDataSource } from './device-list-datasource';
 import { Device } from '../../device';
 import { SystemConfigService } from '../../system-config.service';
-import { cardElevation } from '../../style';
+import { dataTableElevation } from '../../style';
 import { Subject } from 'rxjs';
 
 
@@ -20,7 +20,7 @@ export class DeviceListComponent implements AfterViewInit, OnInit {
   @ViewChild(MatSort) sort: MatSort;
   @ViewChild(MatTable) table: MatTable<Device>;
   dataSource: DeviceListDataSource;
-  elevation: string = cardElevation;
+  elevation: string = dataTableElevation;
 
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns = ['id', 'name'];
diff --git a/src/app/list/folder-list/folder-list.component.ts b/src/app/list/folder-list/folder-list.component.ts
index 0fe1a3939..1a360d03c 100644
--- a/src/app/list/folder-list/folder-list.component.ts
+++ b/src/app/list/folder-list/folder-list.component.ts
@@ -6,7 +6,7 @@ import { MatTable } from '@angular/material/table';
 import { FolderListDataSource } from './folder-list-datasource';
 import { Folder } from '../../folder';
 import { SystemConfigService } from '../../system-config.service';
-import { cardElevation } from '../../style';
+import { dataTableElevation } from '../../style';
 import { Subject } from 'rxjs';
 
 @Component({
@@ -19,7 +19,7 @@ export class FolderListComponent implements AfterViewInit, OnInit {
   @ViewChild(MatSort) sort: MatSort;
   @ViewChild(MatTable) table: MatTable<Folder>;
   dataSource: FolderListDataSource;
-  elevation: string = cardElevation;
+  elevation: string = dataTableElevation;
 
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns = ['id', 'label'];
diff --git a/src/app/list/status-list/status-list.component.html b/src/app/list/status-list/status-list.component.html
index 698342b0b..478293d42 100644
--- a/src/app/list/status-list/status-list.component.html
+++ b/src/app/list/status-list/status-list.component.html
@@ -1,3 +1,10 @@
-<app-status-toggle (statusEvent)="onToggle($event)"></app-status-toggle>
-<app-folder-list *ngIf="currentStatus===status.Folders"></app-folder-list>
-<app-device-list *ngIf="currentStatus===status.Devices"></app-device-list>
\ No newline at end of file
+<mat-card class="{{elevation}}">
+    <div fxLayout="row" fxLayoutAlign="space-between start">
+        <mat-card-title>Status</mat-card-title>
+        <app-status-toggle (statusEvent)="onToggle($event)"></app-status-toggle>
+    </div>
+    <mat-card-content>
+        <app-folder-list *ngIf="currentStatus===status.Folders"></app-folder-list>
+        <app-device-list *ngIf="currentStatus===status.Devices"></app-device-list>
+    </mat-card-content>
+</mat-card>
\ No newline at end of file
diff --git a/src/app/list/status-list/status-list.component.ts b/src/app/list/status-list/status-list.component.ts
index 6869b8533..7f5a8a6cf 100644
--- a/src/app/list/status-list/status-list.component.ts
+++ b/src/app/list/status-list/status-list.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Status } from '../../status';
+import { cardElevation } from '../../style';
 
 
 @Component({
@@ -8,8 +9,9 @@ import { Status } from '../../status';
   styleUrls: ['./status-list.component.scss']
 })
 export class StatusListComponent implements OnInit {
-  public currentStatus: Status = Status.Folders;
-  public status = Status;
+  currentStatus: Status = Status.Folders;
+  status = Status; // used in html
+  elevation: string = cardElevation;
 
   constructor() { }
 
diff --git a/src/app/style.ts b/src/app/style.ts
index 1bf2f3660..67db8a077 100644
--- a/src/app/style.ts
+++ b/src/app/style.ts
@@ -1,2 +1,3 @@
 // material design elevation for all dashboard components
-export const cardElevation: string = "mat-elevation-z2";
\ No newline at end of file
+export const cardElevation: string = "mat-elevation-z2";
+export const dataTableElevation: string = "mat-elevation-z0";
\ No newline at end of file