diff --git a/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.scss b/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.scss
index 96aa7a07811a4cbb3df4c6e8130ac05115b2b9c5..fe3b4e59a6241b7ce247a169ea8a0e39a129ba0b 100644
--- a/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.scss
+++ b/src/app/components/participant/_dialogs/user-bonus-token/user-bonus-token.component.scss
@@ -21,3 +21,7 @@ form {
   margin: 10px 0;
   text-align: center;
 }
+
+::ng-deep .mat-form-field .mat-form-field-infix {
+  max-width: 400px;
+}
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
index 978d076a300d08cc545bd77890cacefcca1cc8b1..6fa43925f1a14a6f207aca8da48814c6bc04c5e5 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
@@ -99,7 +99,7 @@
   <ars-row ars-flex-box class="spellcheck">
     <ars-col>
       <button
-        [disabled]="this.commentBody.innerHTML.length === 0"
+        [disabled]="this.commentBody.innerHTML.length < 4 "
         mat-flat-button class="spell-button"
         (click)="grammarCheck(commentBody)">
         {{ 'comment-page.grammar-check' | translate}}
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 247a77ba9a50eec8c7da9a90941665f2257694bf..7147043fee673a63a59e0e14e9bedb04fe5eedd7 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -132,46 +132,6 @@
           <!-- Question board -->
           <ng-container *ngIf="router.url.endsWith('/comments')">
 
-            <button mat-menu-item
-                    *ngIf="user && user.role == 0 && room && !room.questionsBlocked"
-                    tabindex="0"
-                    (click)="navigateCreateQuestion();">
-              <mat-icon>
-                add_circle
-              </mat-icon>
-              <span>{{'header.create-question' | translate}}</span>
-            </button>
-
-            <button mat-menu-item
-                    *ngIf="user && user.role == 0"
-                    tabindex="0"
-                    routerLink="participant/room/{{shortId}}">
-              <mat-icon>
-                flag
-              </mat-icon>
-              <span>{{'header.back-to-room' | translate}}</span>
-            </button>
-
-            <button mat-menu-item
-                    *ngIf="user && user.role == 3"
-                    tabindex="0"
-                    routerLink="creator/room/{{shortId}}">
-              <mat-icon>
-                flag
-              </mat-icon>
-              <span>{{'header.back-to-room' | translate}}</span>
-            </button>
-
-            <button mat-menu-item
-                    *ngIf="user && user.role == 2"
-                    tabindex="0"
-                    routerLink="moderator/room/{{shortId}}">
-              <mat-icon>
-                flag
-              </mat-icon>
-              <span>{{'header.back-to-room' | translate}}</span>
-            </button>
-
             <ng-container>
 
               <button mat-menu-item
@@ -356,6 +316,40 @@
         <span>{{'header.user-bonus-token' | translate}}</span>
       </button>
 
+      <ng-container *ngIf="router.url.endsWith('/comments')">
+
+      <button mat-menu-item
+              *ngIf="user && user.role == 0"
+              tabindex="0"
+              routerLink="participant/room/{{shortId}}">
+        <mat-icon>
+          flag
+        </mat-icon>
+        <span>{{'header.back-to-room' | translate}}</span>
+      </button>
+
+      <button mat-menu-item
+              *ngIf="user && user.role == 3"
+              tabindex="0"
+              routerLink="creator/room/{{shortId}}">
+        <mat-icon>
+          flag
+        </mat-icon>
+        <span>{{'header.back-to-room' | translate}}</span>
+      </button>
+
+      <button mat-menu-item
+              *ngIf="user && user.role == 2"
+              tabindex="0"
+              routerLink="moderator/room/{{shortId}}">
+        <mat-icon>
+          flag
+        </mat-icon>
+        <span>{{'header.back-to-room' | translate}}</span>
+      </button>
+
+        </ng-container>
+
       <button mat-menu-item
               *ngIf="user && !router.url.endsWith('/user')"
               routerLink="/user"
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index a60d2ef3697d4ba2132bb7fd18facb53a42cd28e..0ba3c185fa9df09414b17851be6e96945b5b02b9 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -101,3 +101,7 @@ h3 {
 .or {
   height: 30px;
 }
+
+::ng-deep .mat-form-field .mat-form-field-infix {
+  max-width: 500px;
+}
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 114d441db4106d678b020914057a02bf72cab7fe..0958308a3590122e9565cbf7a400c3272974b1c7 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -266,7 +266,7 @@
     "cancel-description": "Abbrechen",
     "changes-gone-wrong": "Etwas ist schief gelaufen!",
     "changes-successful": "Änderungen gespeichert.",
-    "comments": "Fragen",
+    "comments": "Öffentliche Fragen",
     "comments-deleted": "Alle Fragen wurden gelöscht.",
     "copy-session-id": "Kopiert den Link zu diesem Raum in die Zwischenablage.",
     "create-content": "Frage stellen",
@@ -292,7 +292,7 @@
     "name-length-error": "Titel muss zwischen 3 und 20 Zeichen liegen.",
     "no-moderators": "",
     "present": "Präsentieren",
-    "public-stream": "Fragen",
+    "public-stream": "Öffentliche Fragenliste",
     "really-delete-comments": "Willst du wirklich alle Fragen dieser Sitzung löschen? Die Aktion kann nicht rückgängig gemacht werden.",
     "really-delete-comments-hint": "Es gibt Fragen in dieser Sitzung, die du für einen Bonus markiert hast. Entferne die Markierungen, um alle Fragen zu löschen.",
     "delete-comments-alt-header": "Sterne vergeben",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 864308dff81c022ef1dda66bc7bb7133661ea1e6..324493e33ca9f6700994c72524420d40f4dd16f3 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -267,7 +267,7 @@
     "cancel-description": "Cancel",
     "changes-gone-wrong": "Something went wrong!",
     "changes-successful": "Successfully updated.",
-    "comments": "Questions",
+    "comments": "Public questions",
     "comments-deleted": "All questions have been deleted.",
     "copy-session-id": "Copy the link to this session to the clipboard and pass it on to the session participants.",
     "create-content": "Create content",
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 2129a30d82a5867749d43bcb5f2a104c8a97241a..905f86604bc706e66b050e5df191859f65b480df 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -81,7 +81,7 @@
     "my-sessions": "Zu den Räumen",
     "really-delete-account": "Willst du dein Konto mit allen Sitzungen unwiderruflich löschen? Falls du Boni vergeben hast (Sterne), exportiere die Fragen, damit du eingereichte Bonus-Tokens überprüfen kannst.",
     "sure": "Bist du sicher?",
-    "user-bonus-token": "Deine Bonus-Sterne",
+    "user-bonus-token": "Bonus-Sterne",
     "user-got-tokens": "Du hast noch Sterne für Bonuspunkte, die verloren gehen!",
     "visited-sessions": "Sitzungen",
     "question-wall": "Fragen präsentieren",
@@ -92,7 +92,7 @@
     "edit-tags": "Kategorien",
     "export-questions": "Fragen speichern",
     "delete-questions": "Fragen löschen",
-    "back-to-questionboard": "Öffentliche Fragenliste",
+    "back-to-questionboard": "Fragenliste",
     "back-to-room": "Eingang",
     "moderationboard": "Moderation",
     "create-question": "Frage stellen",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 77c63f74e7cdb004583ae496d0b2df243171994f..56511f2cd119c86b09275f82e750838d68cebf8c 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -70,7 +70,7 @@
     "my-sessions": "Room list",
     "really-delete-account": "Do you want to irrevocably delete your account with all sessions? If you have given bonus stars, export the questions so that you can check submitted bonus tokens.",
     "sure": "Are you sure?",
-    "user-bonus-token": "Your bonus stars",
+    "user-bonus-token": "Bonus stars",
     "user-got-tokens": "You haven't received a star for a good question yet.",
     "visited-sessions": "Sessions",
     "question-wall": "Present questions",
@@ -81,7 +81,7 @@
     "edit-tags": "Tags",
     "export-questions": "Save questions",
     "delete-questions": "Delete questions",
-    "back-to-questionboard": "Public question list",
+    "back-to-questionboard": "Question list",
     "back-to-room": "Entrance",
     "moderationboard": "Moderation",
     "create-question": "Ask a question",