diff --git a/server/database/data.json b/server/database/data.json
index 2e8b000..67b3780 100644
--- a/server/database/data.json
+++ b/server/database/data.json
@@ -1 +1 @@
-[false,false,false,true,false,true,false,false,false,false,false,false,true,false,false,false,false,false,false,true,false,false,false,false,true,false,false,false,false,false,false,true,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false]
\ No newline at end of file
+[false,false,false,true,false,true,false,false,false,false,false,false,true,false,false,false,false,false,false,true,false,false,false,false,true,false,false,false,false,false,false,true,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,true,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,true,false,false,false,false,false,false,false,false,false,false,false,false,false]
\ No newline at end of file
diff --git a/server/views/validate-success.pug b/server/views/validate-success.pug
index ba75bbe..6c56ad1 100644
--- a/server/views/validate-success.pug
+++ b/server/views/validate-success.pug
@@ -1,4 +1,4 @@
 extends layout.pug
 block content
   h1 Uw aanvraag voor box #{number} is sucessvol verstuurd!
-  p U krijgt binnenkort antwoord van het surprise box team van Het Heerenlanden.
+  p U krijgt binnenkort antwoord van het surprise box team van Het Heerenlanden. Herlaad de pagina van het surprise box systeem om veranderingen te zien.
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index b9aaf78..76dbeb2 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -58,6 +58,12 @@ nav {
             }
         }
     }
+
+    @media screen and (max-width: 434px) {
+      a[routerLink="login"] {
+        display: none;
+      }
+    }
 }
 
 main {
diff --git a/src/app/components/form/form.component.html b/src/app/components/form/form.component.html
index be22f07..42a4698 100644
--- a/src/app/components/form/form.component.html
+++ b/src/app/components/form/form.component.html
@@ -3,17 +3,21 @@
   <fa-icon (click)="formService.hideForm()" [icon]="faTimes"></fa-icon>
 
   <form *ngIf="!submitted" [formGroup]="form" (ngSubmit)="onSubmit()">
-    <span class="header">Formulier voor surpise box {{ number }}</span>
-    <label for="name">Naam: </label>
-    <input type="text" formControlName="name"><br>
+    <h4 class="header">Formulier voor surpise box {{ number }}</h4>
 
-    <label for="email">Email: </label>
-    <input type="email" formControlName="email"><br>
+    <label for="name"><span>Naam: </span>
+      <input type="text" formControlName="name">
+    </label>
 
-    <label for="message">Bericht: </label>
-    <textarea formControlName="message"></textarea><br>
+    <label for="email"><span>Email: </span>
+      <input type="email" formControlName="email">
+    </label>
 
-    <input type="submit" value="Verzenden" [disabled]="!form.valid">
+    <label for="message"><span>Bericht: </span>
+      <textarea formControlName="message"></textarea>
+    </label>
+
+    <button type="submit" [disabled]="!form.valid">Verzenden</button>
 
   </form>
 
diff --git a/src/app/components/form/form.component.scss b/src/app/components/form/form.component.scss
index e58b2e7..2bf5a81 100644
--- a/src/app/components/form/form.component.scss
+++ b/src/app/components/form/form.component.scss
@@ -7,7 +7,8 @@
   padding: 3em 2em 1em 2em;
   border-radius: 0.5em;
 
-  span.header {
+  h4.header {
+    margin: 0;
     position: absolute;
     font-weight: bold;
     text-decoration: underline;
@@ -18,15 +19,10 @@
 
   form {
     label {
-      float: left;
       margin: 5px;
-    }
-    textarea, input {
-      border: 1px solid grey;
-      border-radius: 3px;
-      padding: 0.25em;
-      margin: 5px;
-      float: right;
+
+      display: grid;
+      grid-template-columns: 30% 70%;
     }
   }
 
@@ -37,3 +33,10 @@
     right: 1em;
   }
 }
+
+textarea, input, button {
+  border: 1px solid grey;
+  border-radius: 3px;
+  padding: 0.25em;
+  margin: 5px;
+}