diff --git a/src/app/app.component.html b/src/app/app.component.html
index 6c864e523d810c13cee3f83eca51eb9115cb75dc..b55ce601b2a6685c2f2a9d85cbb8cb4f754705cb 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
-<div class="app-fullscreen">
+<div fxLayout="column" fxFill>
   <mat-toolbar color="primary">
     <mat-toolbar-row>
       <span class="app-toolbar-title">
@@ -7,7 +7,7 @@
       <!-- Insert navigation module here -->
     </mat-toolbar-row>
   </mat-toolbar>
-  <div fxLayout="row" fxLayoutAlign="start start" fxLayoutGap="20px" class="app-main">
+  <div fxFlex>
     <router-outlet></router-outlet>
   </div>
 </div>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index b4ec08e2fbf532944d7a30b25ac749cdb6e20182..c169acb90f6ac95bfeb6426745f5c0ada2d25827 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,13 +1 @@
 @import '../theme/_variables.scss';
-
-.app-fullscreen {
-  width: 100%;
-  height: 100%;
-  > div {
-    padding: 10px;
-  }
-}
-
-.app-main {
-  /* Insert more styles here */
-}
diff --git a/src/app/login-screen/login-screen.component.html b/src/app/login-screen/login-screen.component.html
index 7a7178abb8aa0f74a4323123acfbf88214193967..63d5ef717e70fdc0844fe99a7c157ce812f827ed 100644
--- a/src/app/login-screen/login-screen.component.html
+++ b/src/app/login-screen/login-screen.component.html
@@ -1,9 +1,9 @@
-<div fxLayout="column" fxLayoutGap="20px">
-  <div fxLayout="row">
+<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill>
+  <div fxLayout="row" fxLayoutAlign="center">
     <app-login></app-login>
   </div>
-  <div fxLayout="row" fxLayoutGap="5px">
-    <button mat-raised-button color="primary" (click)="openRegisterDialog()">Register</button>
-    <button mat-raised-button color="primary" (click)="openPasswordDialog()">Password reset</button>
+  <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
+    <button mat-button color="primary" (click)="openRegisterDialog()">Register</button>
+    <button mat-button color="primary" (click)="openPasswordDialog()">Password reset</button>
   </div>
 </div>