diff --git a/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.html b/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.html
index d15ef9c5..db39dc10 100644
--- a/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.html
+++ b/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.html
@@ -25,8 +25,10 @@
         <!-- Step 1 - Select item type -->
         <div *ngIf="step === 1">
           <nz-radio-group [(ngModel)]="itemType">
-            <label *ngFor="let type of itemTypes" nz-radio [nzValue]='type.id'>
-              <strong>{{type.name}}</strong><br>
+            <label *ngFor="let type of itemTypes" nz-radio [nzValue]='type.id' [nzDisabled]="!type.available">
+              <strong>{{type.name}}</strong>
+              <nz-tag *ngIf="!type.available" class="available-soon" nzColor="processing">available soon!</nz-tag>
+              <br>
               <span class="radio-description"><em>{{type.description}}</em></span>
             </label>
           </nz-radio-group>
diff --git a/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.sass b/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.sass
index 3cd89190..3e666b07 100644
--- a/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.sass
+++ b/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.sass
@@ -29,3 +29,6 @@ nz-content
 
 .wrong-answer
   color: #ff194f
+
+.available-soon
+  margin-left: 10px
diff --git a/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.ts b/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.ts
index 08c7e1c2..fe9ccd24 100644
--- a/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.ts
+++ b/src/app/dialogs/new-poll-item-dialog/new-poll-item-dialog.component.ts
@@ -21,27 +21,32 @@ const ITEM_TYPES = [
   {
     id: 1,
     name: 'Open Text Question',
-    description: 'Enables the user to fill in a text as answer'
+    description: 'Enables the user to fill in a text as answer.',
+    available: true
   },
   {
     id: 2,
     name: 'Multiple Choice Question',
-    description: 'Lets the user choose between several, pre-defined answers'
+    description: 'Lets the user choose between several, pre-defined answers.',
+    available: true
   },
   {
     id: 3,
     name: 'Quiz Question',
-    description: 'Multiple choice question, which displays the right answer afterwards'
+    description: 'Multiple choice question which displays the right answer afterwards.',
+    available: true
   },
   {
     id: 4,
     name: 'Word Cloud Question',
-    description: 'Single word can be entered. The words will be arranged in form of clouds'
+    description: 'Single word can be entered. The words will be arranged in form of clouds.',
+    available: false
   },
   {
     id: 5,
     name: 'Rating Question',
-    description: 'Star rating.'
+    description: 'Star rating.',
+    available: false
   }
 ];
 
diff --git a/src/app/model/quiz-item-answer.ts b/src/app/model/quiz-item-answer.ts
index b99f3145..0c470e6b 100644
--- a/src/app/model/quiz-item-answer.ts
+++ b/src/app/model/quiz-item-answer.ts
@@ -9,6 +9,4 @@
 export class QuizItemAnswer {
   id: number;
   selectionOption: string;
-  isCorrect: boolean;
-  answerCount: number;
 }
diff --git a/src/app/pages/poll-participants/poll-participants.component.html b/src/app/pages/poll-participants/poll-participants.component.html
index 979d9034..8059d463 100644
--- a/src/app/pages/poll-participants/poll-participants.component.html
+++ b/src/app/pages/poll-participants/poll-participants.component.html
@@ -16,7 +16,7 @@ <h1 class="poll-name">{{poll?.name}}</h1>
       <h2>{{activeItem?.question}}</h2>
 
       <!-- Loading -->
-      <nz-spin *ngIf="activeItemType === ''" nzSize="large"></nz-spin>
+      <nz-spin *ngIf="loading" nzSize="large"></nz-spin>
 
       <!-- Multiple Choice Question -->
       <div class="poll-item-selection-options" *ngSwitchCase="'multiple-choice'">
@@ -50,6 +50,14 @@ <h2>{{activeItem?.question}}</h2>
       nzTitle="Answer was sent"
       nzSubTitle="Waiting for the presenter to select another question ...">
     </nz-result>
+
+    <!-- Waiting for presenter -->
+    <nz-result
+      *ngIf="!poll.currentItem"
+      nzStatus="info"
+      nzTitle="Waiting for presenter"
+      nzSubTitle="Waiting for the presenter to start the poll ...">
+    </nz-result>
   </nz-content>
   <nz-footer class="participants-footer">Provided with ❤ by <a href="https://www.live-poll.de" target="_blank">Live-Poll</a></nz-footer>
 </nz-layout>
diff --git a/src/app/pages/poll-participants/poll-participants.component.ts b/src/app/pages/poll-participants/poll-participants.component.ts
index 7f1b8e4c..ada1c1a5 100644
--- a/src/app/pages/poll-participants/poll-participants.component.ts
+++ b/src/app/pages/poll-participants/poll-participants.component.ts
@@ -21,12 +21,12 @@ export class PollParticipantsComponent implements OnInit, OnDestroy {
 
   // Variables
   slug = '';
-  // poll: Poll = {id: 1, name: 'Test Poll', pollItems: [], currentItem: 1, slug: 'test', startDate: 0, endDate: 0};
   poll: Poll;
   activeItem: MultipleChoiceItem|QuizItem|OpenTextItem;
   activeItemType = '';
   answer = null;
   sent = false;
+  loading = true;
 
   /**
    * Initialize component
@@ -52,13 +52,33 @@ export class PollParticipantsComponent implements OnInit, OnDestroy {
       // Connect to WebSocket
       const subscription = this.websocketService.establishConnection(this.slug);
       subscription.subscribe(pollItem => {
-        // Load poll
-        this.pollService.get(pollItem.pollId).subscribe(poll => this.poll = poll);
-        // Update UI
-        this.activeItemType = pollItem.type;
-        delete pollItem.type;
-        this.activeItem = pollItem;
+        if (Object.keys(pollItem).length > 1) {
+          // Load poll
+          if (!this.poll) {
+            this.pollService.get(pollItem.pollId).subscribe(poll => this.poll = poll);
+          } else {
+            this.poll.currentItem = pollItem.itemId;
+          }
+          // Randomize selection options if it is a quiz item
+          if (pollItem.type === 'quiz') {
+            pollItem.answers = this.toolsService.shuffleList(pollItem.answers);
+          }
+          // Update UI
+          this.activeItemType = pollItem.type;
+          delete pollItem.type;
+          this.activeItem = pollItem;
+        } else {
+          // Load poll
+          if (!this.poll) {
+            this.pollService.get(pollItem.id).subscribe(poll => this.poll = poll);
+          } else {
+            this.poll.currentItem = null;
+          }
+          this.activeItem = null;
+          this.activeItemType = '';
+        }
         this.sent = false;
+        this.loading = false;
       });
     });
   }
@@ -88,6 +108,7 @@ export class PollParticipantsComponent implements OnInit, OnDestroy {
     }
     if (this.websocketService.sendAnswer(this.activeItem.itemId, answerItem)) {
       this.sent = true;
+      this.answer = null;
     } else {
       this.toolsService.showErrorMessage('Could not send answer. Please try again. If the problem occurs again, please try to reload the page.');
     }
diff --git a/src/app/pages/poll/poll.component.html b/src/app/pages/poll/poll.component.html
index 8a043273..5ee4059f 100644
--- a/src/app/pages/poll/poll.component.html
+++ b/src/app/pages/poll/poll.component.html
@@ -99,10 +99,6 @@
                       </ngx-charts-bar-horizontal>
                     </div>
                   </div>
-                  <button nz-button nzType="default" class="preview-button"
-                          [routerLink]="'/p/' + poll.slug + '/' + pollItem.position">
-                    Preview Question<i nz-icon nzType="right"></i>
-                  </button>
 
                   <!-- Header -->
                   <ng-template #header>
@@ -110,7 +106,14 @@
                   </ng-template>
                   <!-- Header options -->
                   <ng-template #options>
+                    <nz-tag *ngIf="poll.currentItem === pollItem.itemId" nzColor="green">
+                      <i nz-icon nzType="loading"></i>
+                      <span>Running</span>
+                    </nz-tag>
                     <nz-tag nzColor="default">{{pollItem.type}}</nz-tag>
+                    <nz-switch class="run-item-switch" nzSize="small" [ngModel]="poll.currentItem === pollItem.itemId"
+                               (click)="onRunPollItem($event, pollItem.itemId)" [nzLoading]="loadingRunPollItemId === pollItem.itemId">
+                    </nz-switch>
                     <button nz-button nzType="primary" [nzSize]="p.nzActive ? 'default' : 'small'"
                             (click)="openEditPollItemDialog($event)">
                       <i nz-icon nzType="edit"></i>Edit
diff --git a/src/app/pages/poll/poll.component.sass b/src/app/pages/poll/poll.component.sass
index 64d8c4f2..21dcd0f8 100644
--- a/src/app/pages/poll/poll.component.sass
+++ b/src/app/pages/poll/poll.component.sass
@@ -26,10 +26,8 @@
 .slug
   margin-left: -2px
 
-.preview-button
-  float: right
-  margin-top: 5px
-  margin-bottom: 10px
+.run-item-switch
+  margin-right: 10px
 
 // -------------- Drag & Drop CSS --------------
 
diff --git a/src/app/pages/poll/poll.component.ts b/src/app/pages/poll/poll.component.ts
index a5eeab22..2f089e2b 100644
--- a/src/app/pages/poll/poll.component.ts
+++ b/src/app/pages/poll/poll.component.ts
@@ -32,6 +32,7 @@ export class PollComponent {
   poll: Poll;
   pollId: number;
   changingState = false;
+  loadingRunPollItemId = 0;
   showNewPollItemDialog = false;
   error = false;
   results = [];
@@ -100,6 +101,25 @@ export class PollComponent {
     });
   }
 
+  /**
+   * Update the current poll item for this poll on the server
+   *
+   * @param event Click event
+   * @param pollItemId Id of the poll item
+   */
+  onRunPollItem(event: MouseEvent, pollItemId: number): void {
+    event.stopPropagation();
+    const oldPollItem = this.poll.currentItem;
+    this.poll.currentItem = this.loadingRunPollItemId = pollItemId === this.poll.currentItem ? null : pollItemId;
+    this.pollService.update(this.poll).subscribe((_) => {
+      this.loadingRunPollItemId = -1;
+    }, (_) => {
+      this.poll.currentItem = oldPollItem;
+      this.loadingRunPollItemId = -1;
+      this.tools.showErrorMessage('Something went wrong. Please try again');
+    });
+  }
+
   /**
    * Change the poll state on the server
    *
@@ -166,7 +186,7 @@ export class PollComponent {
    */
   updatePoll(callback: () => void, error?: () => void): void {
     error = error ?? function(): void {
-      this.tools.showErrorMessage('The change could not be committed on the server. Please try again later.');
+      this.tools.showErrorMessage('The change could not be committed onto the server. Please try again later.');
     };
 
     this.pollService.update(this.poll).subscribe(callback, error);
@@ -201,6 +221,8 @@ export class PollComponent {
    */
   drop(event: CdkDragDrop<string[]>): void {
     moveItemInArray(this.poll.pollItems, event.previousIndex, event.currentIndex);
+    // Update position on server
+    // TODO: Ask team what to do when dropping item, because I would have to do a API request for every position update
   }
 
   /**
@@ -260,7 +282,7 @@ export class PollComponent {
   /**
    * Shows the dialog a specific poll item
    */
-  openEditPollItemDialog(event: any): void {
+  openEditPollItemDialog(event: MouseEvent): void {
     event.stopPropagation();
     // Open edit dialog
     this.showEditPollItemDialog = true;
diff --git a/src/app/pages/poll/poll.module.ts b/src/app/pages/poll/poll.module.ts
index 51549ce7..51578887 100644
--- a/src/app/pages/poll/poll.module.ts
+++ b/src/app/pages/poll/poll.module.ts
@@ -33,6 +33,7 @@ import {NzCollapseModule} from 'ng-zorro-antd/collapse';
 import {DragDropModule} from '@angular/cdk/drag-drop';
 import {NgxChartsModule} from '@swimlane/ngx-charts';
 import {NzStatisticModule} from 'ng-zorro-antd/statistic';
+import {NzSwitchModule} from 'ng-zorro-antd/switch';
 
 @NgModule({
   declarations: [PollComponent],
@@ -65,7 +66,8 @@ import {NzStatisticModule} from 'ng-zorro-antd/statistic';
         NzCollapseModule,
         DragDropModule,
         NgxChartsModule,
-        NzStatisticModule
+        NzStatisticModule,
+        NzSwitchModule
     ]
 })
 export class PollModule { }
diff --git a/src/app/service/common-tools.service.ts b/src/app/service/common-tools.service.ts
index 6e087d9e..a7756b0c 100644
--- a/src/app/service/common-tools.service.ts
+++ b/src/app/service/common-tools.service.ts
@@ -78,4 +78,26 @@ export class CommonToolsService {
       .replace(/([A-Z])([A-Z])(?=[a-z])/g, '$1-$2')
       .toLowerCase();
   }
+
+  // Fisher-Yates Shuffle
+  // https://bost.ocks.org/mike/shuffle/
+  shuffleList(array: any[]): any[] {
+    let currentIndex = array.length;
+    let temp: number;
+    let randomIndex: number;
+
+    // While there remain elements to shuffle
+    while (currentIndex !== 0) {
+      // Pick a remaining element
+      randomIndex = Math.floor(Math.random() * currentIndex);
+      currentIndex--;
+
+      // And swap it with the current element
+      temp = array[currentIndex];
+      array[currentIndex] = array[randomIndex];
+      array[randomIndex] = temp;
+    }
+    
+    return array;
+  }
 }
diff --git a/src/app/service/websocket.service.ts b/src/app/service/websocket.service.ts
index 3ade719c..9065c9ec 100644
--- a/src/app/service/websocket.service.ts
+++ b/src/app/service/websocket.service.ts
@@ -49,7 +49,6 @@ export class WebsocketService {
    * @param answer Answer object, which will be serialized
    */
   sendAnswer(pollItemId: number, answer: MultipleChoiceItemAnswerParticipant): boolean {
-    console.log(answer);
     if (this.stompClient.connected) {
       this.stompClient.publish({
         destination: ENDPOINT_MESSAGING_WRITE_URL + '/' + pollItemId,