diff --git a/src/app/login-screen/login-screen.component.html b/src/app/login-screen/login-screen.component.html
index 822d124a72bd6af93b9802296651abd76ae8d204..13c68389b453b67753c26c070662ec73138d3808 100644
--- a/src/app/login-screen/login-screen.component.html
+++ b/src/app/login-screen/login-screen.component.html
@@ -1,4 +1,9 @@
-<app-login></app-login>
-<button mat-raised-button color="primary" (click)="openRegisterDialog()">Register</button>
-<button mat-raised-button color="primary">Password reset</button>
-
+<div fxLayout="column" fxLayoutGap="20px" class="full-width">
+  <div fxLayout="row">
+    <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">Password reset</button>
+  </div>
+</div>
diff --git a/src/app/login-screen/login-screen.component.scss b/src/app/login-screen/login-screen.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3db0dee74b28025363b0ed9385f460e3b6163042 100644
--- a/src/app/login-screen/login-screen.component.scss
+++ b/src/app/login-screen/login-screen.component.scss
@@ -0,0 +1,3 @@
+.full-width {
+  width: 100%;
+}
diff --git a/src/app/register/register.component.html b/src/app/register/register.component.html
index 47d1d6166592587ed4e5a6c383089da886db7c0c..df6ed907d9c1b96f19c82cff0a949039f486c712 100644
--- a/src/app/register/register.component.html
+++ b/src/app/register/register.component.html
@@ -1,20 +1,20 @@
 <form>
 
   <mat-form-field class="input-block">
-    <input matInput #email maxlength="256" placeholder="e-mail">
+    <input matInput #email maxlength="256" placeholder="E-mail">
     <mat-hint align="start"><strong></strong></mat-hint>
   </mat-form-field>
 
   <mat-form-field class="input-block">
-    <input matInput type="password" #passwd maxlength="256" placeholder="password">
+    <input matInput type="password" #passwd maxlength="256" placeholder="Password">
     <mat-hint align="start"><strong></strong></mat-hint>
-    <mat-hint align="end">{{passwd.value.length}} / 12</mat-hint>
+    <mat-hint align="end">{{passwd.value.length}} / 256</mat-hint>
   </mat-form-field>
 
   <mat-form-field class="input-block">
-    <input matInput type="password" #passwd2 maxlength="256" placeholder="verify password">
+    <input matInput type="password" #passwd2 maxlength="256" placeholder="Verify password">
     <mat-hint align="start"><strong></strong></mat-hint>
-    <mat-hint align="end">{{passwd2.value.length}} / 12</mat-hint>
+    <mat-hint align="end">{{passwd2.value.length}} / 256</mat-hint>
   </mat-form-field>
   <div *ngIf="passwd.value === passwd2.value && passwd.value.length !== 0">
     <mat-icon>check_circle</mat-icon>
@@ -23,7 +23,6 @@
     <mat-icon>clear</mat-icon>
   </div>
 
-  <button mat-raised-button color="primary">back</button>
-  <button mat-raised-button color="primary" (click)="save(email.value, passwd.value, passwd2.value)">save</button>
+  <button mat-raised-button color="primary" (click)="save(email.value, passwd.value, passwd2.value)">Register</button>
 
 </form>