diff --git a/src/app/components/shared/footer/footer.component.html b/src/app/components/shared/footer/footer.component.html
index 07c4ac5f8a91a7d2a7a01bf5385d8ca3e1a46e55..4328e717c38d95917e0f9c76521629ae60c0df5e 100644
--- a/src/app/components/shared/footer/footer.component.html
+++ b/src/app/components/shared/footer/footer.component.html
@@ -1,7 +1,8 @@
 <div>
 
   <mat-toolbar class="mat-elevation-z24"
-               id="footer-toolbar">
+               id="footer-toolbar"
+               *ngIf="!router.url.endsWith('/quiz')">
 
     <button (click)="showDemo()"
             aria-labelledby="demo-label"
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 41152182f3644b300f91f022a052262504574c12..47f04b84d42ad05f624de8805bcc3d1ef7b3e653 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -405,6 +405,14 @@
 
       </ng-container>
 
+      <button mat-menu-item
+              *ngIf="user && router.url.endsWith('/quiz')"
+              tabindex="0"
+              (click)="goBack()">
+        <mat-icon class="header-icons">forum</mat-icon>
+        <span>{{'header.back-to-questionboard' | translate}}</span>
+      </button>
+
       <button mat-menu-item
               *ngIf="user && !router.url.endsWith('/user')"
               routerLink="/user"
diff --git a/src/app/components/shared/quiz-now/quiz-now.component.scss b/src/app/components/shared/quiz-now/quiz-now.component.scss
index 283440e2ef29b9675e4f7154a691b342cef102f0..93a37d5b06121c9170783872a2edba3407cbc31b 100644
--- a/src/app/components/shared/quiz-now/quiz-now.component.scss
+++ b/src/app/components/shared/quiz-now/quiz-now.component.scss
@@ -9,10 +9,34 @@ iframe {
 
 .responsive-iframe {
   position: absolute;
-  top: 0;
+  top: 6%;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
 }
+
+@media only screen and (max-width: 600px) {
+  .responsive-iframe {
+    top: 10%;
+  }
+}
+
+@media only screen and (max-width: 768px) {
+  .responsive-iframe {
+    top: 9%;
+  }
+}
+
+@media only screen and (max-width: 992px) {
+  .responsive-iframe {
+    top: 8%;
+  }
+}
+
+@media only screen and (max-width: 1200px) {
+  .responsive-iframe {
+    top: 7%;
+  }
+}