diff --git a/package-lock.json b/package-lock.json
index a42e9fc4..b10ec721 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2127,6 +2127,11 @@
         "schema-utils": "^2.7.0"
       }
     },
+    "@juggle/resize-observer": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.2.0.tgz",
+      "integrity": "sha512-fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg=="
+    },
     "@ngtools/webpack": {
       "version": "11.0.3",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.0.3.tgz",
@@ -3245,6 +3250,11 @@
         "callsite": "1.0.0"
       }
     },
+    "bezier-easing": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz",
+      "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -10379,6 +10389,16 @@
       "resolved": "https://registry.npmjs.org/ngx-cookieconsent/-/ngx-cookieconsent-2.2.3.tgz",
       "integrity": "sha512-vg7M4XZSTFRAQq20M0YVJdz5OkXIu0t0MSYos0vvu7oblaEivQstA1Mg5bO7OJYp+oFoTEefWhvO2nCiyHn9SQ=="
     },
+    "ngx-scrollbar": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/ngx-scrollbar/-/ngx-scrollbar-7.4.1.tgz",
+      "integrity": "sha512-yuM2oLOJTr6cc6I9pN0Wtq33jK3Thi2ArKObQOwjWpiMBf5ezvXnKYdNHu39rUkkXcITUV5o/tS3eGIW7xWVxw==",
+      "requires": {
+        "@juggle/resize-observer": "*",
+        "bezier-easing": "*",
+        "tslib": "^2.0.0"
+      }
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
diff --git a/package.json b/package.json
index 0f29401e..9e679161 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "ng-zorro-antd": "^10.2.0",
     "ngx-cookie-service": "^11.0.2",
     "ngx-cookieconsent": "^2.2.3",
+    "ngx-scrollbar": "^7.4.1",
     "rxjs": "~6.6.0",
     "tslib": "^2.0.3",
     "zone.js": "~0.10.2"
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index defd8fb2..19e99e71 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -19,7 +19,8 @@ const routes: Routes = [
       { path: 'analytics', loadChildren: () => import('./pages/analytics/analytics.module').then(m => m.AnalyticsModule) }
     ]
   },
-  { path: 'p/:snippet', redirectTo: '/error' },
+  { path: 'p/:snippet', loadChildren: () => import('./pages/poll-participants/poll-participants.module')
+      .then(m => m.PollParticipantsModule) },
   { path: '**', pathMatch: 'full', redirectTo: '/error' },
   { path: 'error', loadChildren: () => import('./pages/error/error.module').then(m => m.ErrorModule) },
 ];
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 27970dff..efe975c8 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -23,6 +23,7 @@ export class AppComponent implements OnInit {
 
   // Event Emitters
   onUserDataChanged: EventEmitter<User>;
+  onLoginResultChanged: EventEmitter<string>;
 
   // Variables
   currentPage: any;
@@ -70,6 +71,9 @@ export class AppComponent implements OnInit {
       this.onUserDataChanged = child.onUserDataChanged;
       if (this.userData) this.onUserDataChanged.emit(this.userData);
     }
+    if (child.onLoginResultChanged) {
+      this.onLoginResultChanged = child.onLoginResultChanged;
+    }
     if (child.onLogout) {
       child.onLogout.subscribe(_ => this.logout());
     }
@@ -136,8 +140,10 @@ export class AppComponent implements OnInit {
     this.http.post<string>(env.apiBaseUrl + '/authenticate/login', body, options).subscribe((_: HttpResponse<string>) => {
       // Load user data
       this.loadUserData(true);
-    }, (_) => {
+    }, (error) => {
       this.showErrorMessage('Login failed.');
+      console.log(error);
+      this.onLoginResultChanged.emit(error);
     });
   }
 
@@ -180,7 +186,7 @@ export class AppComponent implements OnInit {
     this.darkTheme = darkTheme;
     if (darkTheme) {
       // Remove light theme
-      const dom = document.getElementById('light-theme');
+      const dom = document.getElementById('dark-theme');
       if (dom) dom.remove();
       // Apply dark theme
       const style = document.createElement('link');
@@ -191,13 +197,13 @@ export class AppComponent implements OnInit {
       document.body.appendChild(style);
     } else {
       // Remove dark theme
-      const dom = document.getElementById('dark-theme');
+      const dom = document.getElementById('light-theme');
       if (dom) dom.remove();
       // Apply light theme
       const style = document.createElement('link');
       style.type = 'text/css';
       style.rel = 'stylesheet';
-      style.id = 'dark-theme';
+      style.id = 'light-theme';
       style.href = 'assets/themes/light.css';
       document.body.appendChild(style);
     }
diff --git a/src/app/components/main-options-menu/main-options-menu.component.html b/src/app/components/main-options-menu/main-options-menu.component.html
index 4c474f17..d2c97b89 100644
--- a/src/app/components/main-options-menu/main-options-menu.component.html
+++ b/src/app/components/main-options-menu/main-options-menu.component.html
@@ -1,13 +1,17 @@
-<nz-tabset nzTabBarGutter="0" style="margin: -12px -16px;">
+<!--
+  ~ Copyright © Live-Poll 2020. All rights reserved
+  -->
+
+<nz-tabset nzTabBarGutter="0">
   <!-- Account tab -->
   <nz-tab [nzTitle]="tabTitle1">
-    <div nz-row style="width: 410px; margin-top: -16px; padding: 10px">
+    <div nz-row class="tab-1">
       <div nz-col nzSpan="8">
         <div class="center"><nz-avatar [nzSize]="90" nzIcon="user"></nz-avatar></div>
         <!-- Upload button for new profile images -->
         <nz-upload nzAction="https://api.live-poll.de/upload/p29845982348z"
                    [nzHeaders]="{ authorization: 'authorization-text' }">
-          <button nz-button nzType="dashed" nzSize="small" style="margin-top: 10px">
+          <button nz-button nzType="dashed" nzSize="small" class="upload-image-button">
             <i nz-icon nzType="upload"></i>Upload image
           </button>
         </nz-upload>
@@ -21,25 +25,23 @@
         </span>
 
         <!-- Edit personal data button -->
-        <button nz-button nzSize="small" style="position: absolute; bottom: 0; left: 0;">
+        <button nz-button nzSize="small" class="edit-button">
           <i nz-icon nzType="edit"></i>Edit data
         </button>
         <!-- Logout button -->
-        <button nz-button nzType="primary" nzSize="small" style="position: absolute; bottom: 0; right: 0;"
-                (click)="logout.emit()">
+        <button nz-button nzType="primary" nzSize="small" class="logout-button" (click)="logout.emit()">
           <i nz-icon nzType="logout"></i>Logout
         </button>
       </div>
     </div>
 
     <ng-template #tabTitle1>
-      <span style="margin: 0 15px;"><i nz-icon nzType="user"></i>Account</span>
+      <span class="tab-title"><i nz-icon nzType="user"></i>Account</span>
     </ng-template>
   </nz-tab>
   <!-- Notifications tab -->
   <nz-tab [nzTitle]="tabTitle2">
-    <nz-collapse *ngIf="notifications.length > 0" nzBordered="true" nzAccordion
-                 style="user-select: none; width: 410px; margin-top: -16px;">
+    <nz-collapse *ngIf="notifications.length > 0" nzBordered="true" nzAccordion class="notification-list no-select">
       <nz-collapse-panel #p *ngFor="let notification of notifications" [nzHeader]="header"
                          [nzExtra]="options" [nzExpandedIcon]="expandedIcon">
         <!-- Item content -->
@@ -57,16 +59,15 @@
         </ng-template>
         <!-- Expand icon -->
         <ng-template #expandedIcon>
-          <i nz-icon nzType="right-circle" class="ant-collapse-arrow" [nzRotate]="p.nzActive ? 90 : 0"
-             style="font-size: 16px;"></i>
+          <i nz-icon nzType="right" class="ant-collapse-arrow" [nzRotate]="p.nzActive ? 90 : 0"></i>
         </ng-template>
       </nz-collapse-panel>
     </nz-collapse>
     <nz-empty *ngIf="notifications.length === 0"></nz-empty>
 
-    <ng-template #tabTitle2 style="padding: 5px">
+    <ng-template #tabTitle2>
       <nz-badge [nzCount]="notifications.length">
-        <span style="margin: 0 15px;"><i nz-icon nzType="notification"></i>Notifications</span>
+        <span class="tab-title"><i nz-icon nzType="notification"></i>Notifications</span>
       </nz-badge>
     </ng-template>
   </nz-tab>
diff --git a/src/app/components/main-options-menu/main-options-menu.component.sass b/src/app/components/main-options-menu/main-options-menu.component.sass
index e69de29b..ae39cd77 100644
--- a/src/app/components/main-options-menu/main-options-menu.component.sass
+++ b/src/app/components/main-options-menu/main-options-menu.component.sass
@@ -0,0 +1,31 @@
+/*!
+ / Copyright © Live-Poll 2020. All rights reserved
+ /
+
+nz-tabset
+  margin: -12px -16px
+
+.tab-1
+  width: 410px
+  margin-top: -16px
+  padding: 10px
+
+.upload-image-button
+  margin-top: 10px
+
+.edit-button
+  position: absolute
+  bottom: 0
+  left: 0
+
+.logout-button
+  position: absolute
+  bottom: 0
+  right: 0
+
+.tab-title
+  margin: 0 15px
+
+.notification-list
+  width: 410px
+  margin-top: -16px
diff --git a/src/app/components/main-options-menu/main-options-menu.component.spec.ts b/src/app/components/main-options-menu/main-options-menu.component.spec.ts
index 6e666593..2d784d6b 100644
--- a/src/app/components/main-options-menu/main-options-menu.component.spec.ts
+++ b/src/app/components/main-options-menu/main-options-menu.component.spec.ts
@@ -1,6 +1,10 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
 
-import { MainOptionsMenuComponent } from './main-options-menu.component';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {MainOptionsMenuComponent} from './main-options-menu.component';
 
 describe('MainOptionsMenuComponent', () => {
   let component: MainOptionsMenuComponent;
diff --git a/src/app/components/main-options-menu/main-options-menu.component.ts b/src/app/components/main-options-menu/main-options-menu.component.ts
index 9905dff0..af5df912 100644
--- a/src/app/components/main-options-menu/main-options-menu.component.ts
+++ b/src/app/components/main-options-menu/main-options-menu.component.ts
@@ -1,3 +1,7 @@
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
 import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {User} from '../../model/user';
 
diff --git a/src/app/components/main-options-menu/main-options-menu.module.ts b/src/app/components/main-options-menu/main-options-menu.module.ts
index f2e9b65d..580d4368 100644
--- a/src/app/components/main-options-menu/main-options-menu.module.ts
+++ b/src/app/components/main-options-menu/main-options-menu.module.ts
@@ -1,6 +1,10 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MainOptionsMenuComponent } from './main-options-menu.component';
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {MainOptionsMenuComponent} from './main-options-menu.component';
 import {NzTabsModule} from 'ng-zorro-antd/tabs';
 import {NzUploadModule} from 'ng-zorro-antd/upload';
 import {NzAvatarModule} from 'ng-zorro-antd/avatar';
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 d704898f..160e676c 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
@@ -2,8 +2,8 @@
   ~ Copyright © Live-Poll 2020. All rights reserved
   -->
 
-<nz-modal [(nzVisible)]="isVisible" (nzOnCancel)="handleCancel()" nzWidth="850px"
-          [nzTitle]="dialogTitle" [nzContent]="dialogContent" [nzFooter]="dialogFooter">
+<nz-modal [(nzVisible)]="isVisible" (nzOnCancel)="handleCancel()" nzWidth="850px" [nzTitle]="dialogTitle"
+          [nzContent]="dialogContent" [nzFooter]="dialogFooter">
   <!-- Header -->
   <ng-template #dialogTitle>
     New Poll Item - {{step > stepLabels.length ? 'Creating ...' : stepLabels[step -1]}}
@@ -11,7 +11,7 @@
 
   <!-- Content -->
   <ng-template #dialogContent>
-    <nz-layout style="margin: -24px">
+    <nz-layout class="dialog-content">
       <!-- Side bar with timeline -->
       <nz-sider class="dialog-sidebar" nzWidth="300px">
         <nz-steps [nzCurrent]="step -1" nzDirection="vertical" nzSize="small">
@@ -54,11 +54,11 @@
                 <input nz-input [(ngModel)]="answers[i]" />
               </nz-input-group>
               <ng-template #suffixTemplate>
-                <i nz-icon [nzType]="'delete'" style="cursor: pointer" (click)="answers.splice(i, 1)"></i>
+                <i nz-icon [nzType]="'delete'" class="cursor-pointer" (click)="answers.splice(i, 1)"></i>
               </ng-template>
             </label>
             <!-- Add answer button -->
-            <div style="padding-top: 10px; float: right;">
+            <div class="add-answer-button-container">
               <button [disabled]="answers.length >= 10" nz-button nzType="default" (click)="answers.push('')">
                 <i nz-icon nzType="plus-circle" nzTheme="outline"></i> Answer
               </button>
@@ -70,19 +70,19 @@
           <div *ngIf="itemType == 3">
             <!-- Answers -->
             <label *ngFor="let answer of answers; let i = index; trackBy:trackByFn">
-              <span class="input-label" [style]="i === 0 ? 'color: #4ca857;' : 'color: #ff194f;'">
+              <span class="input-label" [class]="i === 0 ? 'right-answer' : 'wrong-answer'">
                 {{i === 0 ? 'Right answer' : 'Wrong answer ' + i}}:
               </span>
               <nz-input-group [nzSuffix]="i < 2 ? null : suffixTemplate">
                 <input nz-input [(ngModel)]="answers[i]" [placeholder]="i === 0 ? 'Enter right answer ...' : 'Enter wrong answer ...'"/>
               </nz-input-group>
               <ng-template #suffixTemplate>
-                <i nz-icon [nzType]="'delete'" style="cursor: pointer" (click)="answers.splice(i, 1)"></i>
+                <i nz-icon [nzType]="'delete'" class="cursor-pointer" (click)="answers.splice(i, 1)"></i>
               </ng-template>
             </label>
             <!-- Add answer button -->
-            <div style="padding-top: 10px; float: right;">
-              <em style="margin-inline-end: 20px;">The answers are going to be randomized for each user.</em>
+            <div class="add-answer-button-container">
+              <em class="add-answer-button-label">The answers are going to be randomized for each user.</em>
               <button [disabled]="answers.length >= 5" nz-button nzType="default" (click)="answers.push('')">
                 <i nz-icon nzType="plus-circle" nzTheme="outline"></i> Answer
               </button>
@@ -103,12 +103,12 @@
             <!-- Type int -->
             <label *ngIf="option.type === optionTypes.INT">
               <span class="input-label">{{option.name}}:</span><br>
-              <input nz-input type="number" [min]="option.min" [max]="option.max" style="width: 100px" [(ngModel)]="option.value"/>
+              <input nz-input type="number" [min]="option.min" [max]="option.max" class="full-width" [(ngModel)]="option.value"/>
             </label>
             <!-- Type string -->
             <label *ngIf="option.type === optionTypes.STRING">
               <span class="input-label">{{option.name}}:</span><br>
-              <input nz-input style="width: 200px" [(ngModel)]="option.value"/>
+              <input nz-input width="200px" [(ngModel)]="option.value"/>
             </label>
           </div>
         </div>
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 b796977e..98cb12bf 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
@@ -14,3 +14,19 @@ nz-content
 
 .radio-description
   margin-left: 25px
+
+.dialog-content
+  margin: -24px
+
+.add-answer-button-container
+  padding-top: 10px
+  float: right
+
+.add-answer-button-label
+  margin-inline-end: 20px
+
+.right-answer
+  color: #4ca857
+
+.wrong-answer
+  color: #ff194f
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 099f9055..07143cae 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
@@ -178,7 +178,7 @@ export class NewPollItemDialogComponent {
       .subscribe((response: HttpResponse<string>) => {
         if (response.ok) {
           // Request was successful, continue
-          this.onClose.emit(false);
+          this.onClose.emit(true);
           // Reset dialog
           this.step = 1;
           this.itemType = 0;
diff --git a/src/app/model/poll.ts b/src/app/model/poll.ts
index 6750c34a..0754d155 100644
--- a/src/app/model/poll.ts
+++ b/src/app/model/poll.ts
@@ -13,7 +13,6 @@ export class Poll {
   name: string;
   startDate: Date;
   endDate: Date;
-  open: boolean;
   snippet: string;
   pollItems: PollItem[];
 }
diff --git a/src/app/pages/analytics/analytics.component.html b/src/app/pages/analytics/analytics.component.html
index c47f03b2..79d35948 100644
--- a/src/app/pages/analytics/analytics.component.html
+++ b/src/app/pages/analytics/analytics.component.html
@@ -13,7 +13,7 @@
 </nz-breadcrumb>
 
 <!-- Page content -->
-<nz-content style="margin-top: 10px">
+<nz-content class="page-content">
   <div class="inner-content">
     <p *ngIf="polls?.length > 0">Polls found. This component does render them in the future!</p>
 
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
index 8da80301..28f78690 100644
--- a/src/app/pages/dashboard/dashboard.component.html
+++ b/src/app/pages/dashboard/dashboard.component.html
@@ -35,13 +35,13 @@ <h1>Live-Poll</h1>
           <i class="trigger" nz-icon [nzType]="isCollapsed ? 'menu-unfold' : 'menu-fold'"></i>
         </span>
         <span class="header-menu">
-          <nz-switch [ngModel]="!darkTheme" (ngModelChange)="onChangeTheme.emit(!$event)" style="margin-right: 10px"
+          <nz-switch [ngModel]="!darkTheme" (ngModelChange)="onChangeTheme.emit(!$event)" class="theme-switch"
                      [nzUnCheckedChildren]="unchecked" [nzCheckedChildren]="checked"></nz-switch>
           <ng-template #unchecked><i nz-icon nzType="smile" nzTheme="outline"></i></ng-template>
           <ng-template #checked><i nz-icon nzType="bulb"></i></ng-template>
-          <nz-badge [nzCount]="getNonSilentNotifications().length" nzOverflowCount="9" style="margin-right: 24px;">
-              <nz-avatar nzIcon="user" nz-popover [nzPopoverContent]="userMenu"
-                         nzPopoverPlacement="bottomRight" nzPopoverTrigger="click" style="cursor: pointer;"></nz-avatar>
+          <nz-badge [nzCount]="getNonSilentNotifications().length" nzOverflowCount="9" class="notification-badge">
+              <nz-avatar nzIcon="user" nz-popover [nzPopoverContent]="userMenu" nzPopoverPlacement="bottomRight"
+                         nzPopoverTrigger="click" class="cursor-pointer"></nz-avatar>
             </nz-badge>
           <ng-template #userMenu>
             <app-main-options-menu [userData]="userData" [notifications]="notifications" (logout)="onLogout.emit()"
diff --git a/src/app/pages/dashboard/dashboard.component.sass b/src/app/pages/dashboard/dashboard.component.sass
index e30732e8..56ee6a18 100644
--- a/src/app/pages/dashboard/dashboard.component.sass
+++ b/src/app/pages/dashboard/dashboard.component.sass
@@ -10,6 +10,7 @@
 
 .app-layout
   height: 100vh
+  overflow-y: hidden
 
 .menu-sidebar
   position: relative
@@ -66,3 +67,9 @@ nz-header
 
 .inner-layout
   padding: 15px
+
+.theme-switch
+  margin-right: 10px
+
+.notification-badge
+  margin-right: 24px
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index 0da6c69f..6133a8d4 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -10,7 +10,7 @@
 </nz-breadcrumb>
 
 <!-- Page content -->
-<nz-content style="margin-top: 10px">
+<nz-content class="page-content">
   <div class="inner-content">
 
     <p *ngIf="polls?.length > 0">Polls found. This component does render them in the future!</p>
diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html
index dc7a8132..141965af 100644
--- a/src/app/pages/login/login.component.html
+++ b/src/app/pages/login/login.component.html
@@ -68,8 +68,12 @@ <h3>Reset password:</h3>
         </nz-form-control>
       </nz-form-item>
       <!-- Reset button -->
-      <button nz-button nzType="primary" style="float: right;" [nzLoading]="loading">{{loading ? 'Sending email ...' : 'Reset password'}}</button>
-      <button nz-button nzType="default" style="float: right; margin-right: 5px" [disabled]="loading" (click)="loginMode = true">Back</button>
+      <button nz-button nzType="primary" class="submit-button" [nzLoading]="loading">
+        {{loading ? 'Sending email ...' : 'Reset password'}}
+      </button>
+      <button nz-button nzType="default" class="back-button" [disabled]="loading" (click)="loginMode = true">
+        Back
+      </button>
     </form>
   </nz-card>
 
diff --git a/src/app/pages/login/login.component.sass b/src/app/pages/login/login.component.sass
index 82a7697c..8889d2b7 100644
--- a/src/app/pages/login/login.component.sass
+++ b/src/app/pages/login/login.component.sass
@@ -36,3 +36,10 @@ nz-form-item
 h3
   color: grey
   text-align: center
+
+.submit-button
+  float: right
+
+.back-button
+  float: right
+  margin-right: 5px
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index c3d4399e..88061960 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -19,6 +19,7 @@ export class LoginComponent implements OnInit {
 
   // Event Emitters
   onLogin = new EventEmitter<User>();
+  onLoginResultChanged = new EventEmitter<string>();
 
   // Variables
   darkTheme = false;
@@ -45,6 +46,7 @@ export class LoginComponent implements OnInit {
    * Initialize form validation
    */
   ngOnInit(): void {
+    // Initialize form
     this.loginForm = this.formBuilder.group({
       username: [null, [Validators.required]],
       password: [null, [Validators.required]],
@@ -53,6 +55,12 @@ export class LoginComponent implements OnInit {
     this.resetPasswordForm = this.formBuilder.group({
       username: [null, [Validators.required]]
     });
+    // Wire up event emitters
+    this.onLoginResultChanged.subscribe(errorMessage => {
+      this.loginForm.controls.password.reset();
+      this.loading = false;
+      this.passwordVisible = false;
+    });
   }
 
   /**
diff --git a/src/app/pages/my-polls/my-polls.component.html b/src/app/pages/my-polls/my-polls.component.html
index f632205c..1393dc71 100644
--- a/src/app/pages/my-polls/my-polls.component.html
+++ b/src/app/pages/my-polls/my-polls.component.html
@@ -8,89 +8,90 @@
     <a routerLink="/dashboard/home" nz-icon nzType="home"></a>
   </nz-breadcrumb-item>
   <nz-breadcrumb-item>
-    <a routerLink="/dashboard//my-polls"><em>My Polls</em></a>
+    <a routerLink="/dashboard/my-polls"><em>My Polls</em></a>
   </nz-breadcrumb-item>
 </nz-breadcrumb>
 
 <!-- Page content -->
-<nz-content style="margin-top: 10px">
-  <div>
-    <!-- Toolbar -->
-    <nz-page-header>
-      <nz-page-header-subtitle>Click on a poll for details</nz-page-header-subtitle>
-      <nz-page-header-extra>
-        <button nz-button nzType="primary" (click)="showNewPollDialog = true">New poll</button>
-      </nz-page-header-extra>
-    </nz-page-header>
+<nz-content class="page-content">
+  <!-- Toolbar -->
+  <nz-page-header>
+    <nz-page-header-subtitle>Click on a poll for details</nz-page-header-subtitle>
+    <nz-page-header-extra>
+      <button nz-button nzType="primary" (click)="showNewPollDialog = true">New poll</button>
+    </nz-page-header-extra>
+  </nz-page-header>
 
-    <!-- Poll list -->
-    <nz-collapse *ngIf="polls !== undefined && polls !== null && polls.length > 0" nzBordered="false" nzAccordion
-                 style="user-select: none;">
-      <nz-collapse-panel #p *ngFor="let poll of polls" [nzHeader]="header" [nzExtra]="options"
-                         [nzExpandedIcon]="expandedIcon">
-        <!-- Item content -->
-        <nz-row [nzGutter]="12">
-          <nz-col [nzSpan]="12">
-            <nz-card>
-              <nz-statistic [nzValue]="10" nzTitle="Participants"
-                [nzValueStyle]="{ color: '#3F8600' }">
-              </nz-statistic>
-            </nz-card>
-          </nz-col>
-          <nz-col [nzSpan]="12">
-            <nz-card>
-              <nz-statistic [nzValue]="5" nzTitle="Questions"
-                [nzValueStyle]="{ color: '#CF1322' }">
-              </nz-statistic>
-            </nz-card>
-          </nz-col>
-        </nz-row>
+  <!-- Poll list -->
+  <ng-scrollbar class="scrollbar">
+    <div class="poll-list-container" *ngIf="polls !== undefined && polls !== null && polls.length > 0">
+      <nz-collapse nzBordered="false" nzAccordion class="no-select">
+        <nz-collapse-panel #p *ngFor="let poll of polls" [nzHeader]="header" [nzExtra]="options"
+                           [nzExpandedIcon]="expandedIcon">
+          <!-- Item content -->
+          <nz-row [nzGutter]="12">
+            <nz-col [nzSpan]="12">
+              <nz-card>
+                <nz-statistic [nzValue]="10" nzTitle="Participants"
+                              [nzValueStyle]="{ color: '#3F8600' }">
+                </nz-statistic>
+              </nz-card>
+            </nz-col>
+            <nz-col [nzSpan]="12">
+              <nz-card>
+                <nz-statistic [nzValue]="5" nzTitle="Questions"
+                              [nzValueStyle]="{ color: '#CF1322' }">
+                </nz-statistic>
+              </nz-card>
+            </nz-col>
+          </nz-row>
 
-        <!-- Header -->
-        <ng-template #header>
-          <span [style]="p.nzActive ? 'font-size: large; transition: font-size 0.4s;' : 'font-size: small; transition: font-size 0.4s;'">{{poll.name}}</span>
-        </ng-template>
-        <!-- Header options -->
-        <ng-template #options>
-          <nz-tag *ngIf="poll.startDate > currentDate || poll.endDate.getTime() === 0" nzColor="orange">
-            <i nz-icon nzType="clock-circle"></i>
-            <span>Planned</span>
-          </nz-tag>
-          <nz-tag *ngIf="poll.startDate < currentDate && poll.endDate > currentDate" nzColor="green">
-            <i nz-icon nzType="loading"></i>
-            <span>Running</span>
-          </nz-tag>
-          <nz-tag *ngIf="poll.endDate < currentDate && poll.endDate.getTime() !== 0" nzColor="purple">
-            <i nz-icon nzType="check"></i>
-            <span>Finished</span>
-          </nz-tag>
-          <button  nz-button nzType="primary" [nzSize]="p.nzActive ? 'default' : 'small'"
-                   [routerLink]="'/dashboard/my-polls/poll/' + poll.id">
-            Details<i nz-icon nzType="right"></i>
-          </button>
-        </ng-template>
-        <!-- Expand icon -->
-        <ng-template #expandedIcon>
-          <i nz-icon nzType="right-circle" class="ant-collapse-arrow" [nzRotate]="p.nzActive ? 90 : 0"
-             style="font-size: 16px;"></i>
-        </ng-template>
-      </nz-collapse-panel>
-    </nz-collapse>
-
-    <!-- Empty result -->
-    <app-result-empty *ngIf="polls !== undefined && polls !== null && polls.length === 0"
-                      message="You do not have any polls yet. Click on the 'New poll' button above to create one."></app-result-empty>
-
-    <!-- Loading spinner -->
-    <div style="display: flex; align-items: center; justify-content: center;">
-      <nz-spin *ngIf="polls === undefined" nzSimple nzSize="large"></nz-spin>
+          <!-- Header -->
+          <ng-template #header>
+            <span>{{poll.name}}</span>
+          </ng-template>
+          <!-- Header options -->
+          <ng-template #options [ngSwitch]="tools.getPollStatus(poll)">
+            <nz-tag *ngSwitchCase="1" nzColor="orange">
+              <i nz-icon nzType="clock-circle"></i>
+              <span>Planned</span>
+            </nz-tag>
+            <nz-tag *ngSwitchCase="2" nzColor="green">
+              <i nz-icon nzType="loading"></i>
+              <span>Running</span>
+            </nz-tag>
+            <nz-tag *ngSwitchCase="3" nzColor="purple">
+              <i nz-icon nzType="check"></i>
+              <span>Finished</span>
+            </nz-tag>
+            <button  nz-button nzType="primary" [nzSize]="p.nzActive ? 'default' : 'small'"
+                     [routerLink]="'/dashboard/my-polls/poll/' + poll.id">
+              Details<i nz-icon nzType="right"></i>
+            </button>
+          </ng-template>
+          <!-- Expand icon -->
+          <ng-template #expandedIcon>
+            <i nz-icon nzType="right" class="ant-collapse-arrow" [nzRotate]="p.nzActive ? 90 : 0"></i>
+          </ng-template>
+        </nz-collapse-panel>
+      </nz-collapse>
     </div>
+  </ng-scrollbar>
 
-    <!-- Error result -->
-    <app-result-error *ngIf="polls === null"></app-result-error>
+  <!-- Empty result -->
+  <app-result-empty *ngIf="polls !== undefined && polls !== null && polls.length === 0"
+                    message="You do not have any polls yet. Click on the 'New poll' button above to create one.">
+  </app-result-empty>
 
-    <!-- New poll dialog -->
-    <app-new-poll-dialog [isVisible]="showNewPollDialog" (onClose)="handleNewPollDialogClose($event)"
-                         [userData]="userData"></app-new-poll-dialog>
+  <!-- Loading spinner -->
+  <div class="spin-container">
+    <nz-spin *ngIf="polls === undefined" nzSimple nzSize="large"></nz-spin>
   </div>
+
+  <!-- Error result -->
+  <app-result-error *ngIf="polls === null"></app-result-error>
+
+  <!-- New poll dialog -->
+  <app-new-poll-dialog [isVisible]="showNewPollDialog" (onClose)="handleNewPollDialogClose($event)"
+                       [userData]="userData"></app-new-poll-dialog>
 </nz-content>
diff --git a/src/app/pages/my-polls/my-polls.component.sass b/src/app/pages/my-polls/my-polls.component.sass
index fa09112f..86bd425d 100644
--- a/src/app/pages/my-polls/my-polls.component.sass
+++ b/src/app/pages/my-polls/my-polls.component.sass
@@ -2,3 +2,14 @@
  / Copyright © Live-Poll 2020. All rights reserved
  /
 
+.scrollbar
+  max-height: calc(100vh - 195px)
+
+.poll-list-container
+  height: calc(100vh - 195px)
+
+.spin-container
+  display: flex
+  align-items: center
+  justify-content: center
+
diff --git a/src/app/pages/my-polls/my-polls.component.ts b/src/app/pages/my-polls/my-polls.component.ts
index 1d294eb7..86883242 100644
--- a/src/app/pages/my-polls/my-polls.component.ts
+++ b/src/app/pages/my-polls/my-polls.component.ts
@@ -5,6 +5,7 @@
 import {Component, EventEmitter} from '@angular/core';
 import {Poll} from '../../model/poll';
 import {User} from '../../model/user';
+import {CommonToolsService} from '../../service/common-tools.service';
 
 @Component({
   selector: 'app-my-polls',
@@ -29,8 +30,12 @@ export class MyPollsComponent {
 
   /**
    * Initialize MyPolls component
+   *
+   * @param tools Injected tools service
    */
-  constructor() {
+  constructor(
+    private tools: CommonToolsService
+  ) {
     // Subscribe to own event emitters
     this.onUserDataChanged.subscribe(user => this.userData = user);
     this.onPollsChanged.subscribe(polls => this.polls = polls);
diff --git a/src/app/pages/my-polls/my-polls.module.ts b/src/app/pages/my-polls/my-polls.module.ts
index 4d9f3655..2e45cc8d 100644
--- a/src/app/pages/my-polls/my-polls.module.ts
+++ b/src/app/pages/my-polls/my-polls.module.ts
@@ -32,6 +32,7 @@ import {NzGridModule} from 'ng-zorro-antd/grid';
 import {NzCardModule} from 'ng-zorro-antd/card';
 import {NzStatisticModule} from 'ng-zorro-antd/statistic';
 import {NzFormModule} from 'ng-zorro-antd/form';
+import {NgScrollbarModule} from 'ngx-scrollbar';
 
 @NgModule({
   declarations: [MyPollsComponent, NewPollDialogComponent, NewPollItemDialogComponent],
@@ -59,7 +60,8 @@ import {NzFormModule} from 'ng-zorro-antd/form';
         NzGridModule,
         NzCardModule,
         NzStatisticModule,
-        NzFormModule
+        NzFormModule,
+        NgScrollbarModule
     ],
   providers: [],
     exports: [MyPollsComponent, NewPollItemDialogComponent]
diff --git a/src/app/pages/poll-participants/poll-participants-routing.module.ts b/src/app/pages/poll-participants/poll-participants-routing.module.ts
new file mode 100644
index 00000000..d1885aa8
--- /dev/null
+++ b/src/app/pages/poll-participants/poll-participants-routing.module.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {PollParticipantsComponent} from './poll-participants.component';
+
+const routes: Routes = [
+  { path: '', component: PollParticipantsComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PollParticipantsRoutingModule { }
diff --git a/src/app/pages/poll-participants/poll-participants.component.html b/src/app/pages/poll-participants/poll-participants.component.html
new file mode 100644
index 00000000..8d4ba50b
--- /dev/null
+++ b/src/app/pages/poll-participants/poll-participants.component.html
@@ -0,0 +1,5 @@
+<!--
+  ~ Copyright © Live-Poll 2020. All rights reserved
+  -->
+
+<p>poll-participants works!</p>
diff --git a/src/app/pages/poll-participants/poll-participants.component.sass b/src/app/pages/poll-participants/poll-participants.component.sass
new file mode 100644
index 00000000..fa09112f
--- /dev/null
+++ b/src/app/pages/poll-participants/poll-participants.component.sass
@@ -0,0 +1,4 @@
+/*!
+ / Copyright © Live-Poll 2020. All rights reserved
+ /
+
diff --git a/src/app/pages/poll-participants/poll-participants.component.ts b/src/app/pages/poll-participants/poll-participants.component.ts
new file mode 100644
index 00000000..0b45b29a
--- /dev/null
+++ b/src/app/pages/poll-participants/poll-participants.component.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
+import {Component, OnInit} from '@angular/core';
+
+@Component({
+  selector: 'app-poll-participants',
+  templateUrl: './poll-participants.component.html',
+  styleUrls: ['./poll-participants.component.sass']
+})
+export class PollParticipantsComponent implements OnInit {
+
+  constructor() {}
+
+  ngOnInit(): void {}
+
+}
diff --git a/src/app/pages/poll-participants/poll-participants.module.ts b/src/app/pages/poll-participants/poll-participants.module.ts
new file mode 100644
index 00000000..0d6545d4
--- /dev/null
+++ b/src/app/pages/poll-participants/poll-participants.module.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {PollParticipantsComponent} from './poll-participants.component';
+import {PollParticipantsRoutingModule} from './poll-participants-routing.module';
+
+@NgModule({
+  declarations: [PollParticipantsComponent],
+  imports: [
+    PollParticipantsRoutingModule,
+    CommonModule
+  ]
+})
+export class PollParticipantsModule {}
diff --git a/src/app/pages/poll/poll.component.html b/src/app/pages/poll/poll.component.html
index e569707e..014025c3 100644
--- a/src/app/pages/poll/poll.component.html
+++ b/src/app/pages/poll/poll.component.html
@@ -16,36 +16,25 @@
 </nz-breadcrumb>
 
 <!-- Page content -->
-<nz-content style="margin-top: 10px">
+<nz-content class="page-content">
   <nz-page-header *ngIf="!error && poll" class="site-page-header" (nzBack)="onBack()" nzBackIcon>
     <!--title-->
     <nz-page-header-title>{{poll.name}}</nz-page-header-title>
 
     <!--subtitle-->
-    <nz-page-header-subtitle *ngIf="poll.startDate.getTime() !== 0 && poll.endDate.getTime() !== 0">
-      {{poll.startDate | date:'short'}} - {{poll.endDate | date:'short'}}
-    </nz-page-header-subtitle>
-    <nz-page-header-subtitle *ngIf="poll.startDate.getTime() === 0 && poll.endDate.getTime() !== 0">
-      Manual opening, closing automatically at {{poll.endDate | date:'short'}}
-    </nz-page-header-subtitle>
-    <nz-page-header-subtitle *ngIf="poll.startDate.getTime() === 0 && poll.endDate.getTime() !== 0">
-      Opening automatically at {{poll.startDate | date:'short'}}, manual closing
-    </nz-page-header-subtitle>
-    <nz-page-header-subtitle *ngIf="poll.startDate.getTime() === 0 && poll.endDate.getTime() === 0">
-      Manual opening / closing
-    </nz-page-header-subtitle>
+    <nz-page-header-subtitle [innerHTML]="getSubtitle()"></nz-page-header-subtitle>
 
     <!--tags-->
-    <nz-page-header-tags>
-      <nz-tag *ngIf="poll.startDate > currentDate || poll.endDate.getTime() === 0" nzColor="orange">
+    <nz-page-header-tags [ngSwitch]="pollStatus">
+      <nz-tag *ngSwitchCase="1" nzColor="orange">
         <i nz-icon nzType="clock-circle"></i>
         <span>Planned</span>
       </nz-tag>
-      <nz-tag *ngIf="poll.startDate < currentDate && poll.endDate > currentDate" nzColor="green">
+      <nz-tag *ngSwitchCase="2" nzColor="green">
         <i nz-icon nzType="loading"></i>
         <span>Running</span>
       </nz-tag>
-      <nz-tag *ngIf="poll.endDate < currentDate && poll.endDate.getTime() !== 0" nzColor="purple">
+      <nz-tag *ngSwitchCase="3" nzColor="purple">
         <i nz-icon nzType="check"></i>
         <span>Finished</span>
       </nz-tag>
@@ -58,8 +47,8 @@
         <i nz-icon nzType="delete"></i>Delete
       </button>
       <button nz-button><i nz-icon nzType="edit"></i>Edit</button>
-      <button nz-button nzType="primary" [nzLoading]="changingState" (click)="changePollState(!poll.open)">
-        {{poll.open ? 'Close' : 'Open'}}
+      <button nz-button nzType="primary" [nzLoading]="changingState" (click)="changePollState(pollStatus !== 2)">
+        {{pollStatus === 1 ? 'Open' : (pollStatus === 2 ? 'Close' : 'Re-open')}}
       </button>
     </nz-page-header-extra>
 
@@ -67,68 +56,84 @@
     <nz-page-header-content>
       <div nz-row>
         You can share this URL with your participants:&nbsp;
-        <p style="color: #38C6BC">
+        <span class="text-primary">
           {{host}}/p/
-          <span nz-typography nzCopyable nzEditable [nzContent]="poll.snippet" (nzContentChange)="onUrlChange($event)"
-                [nzCopyText]="host + '/' + poll.snippet" style="margin-left: -2px; color: #38C6BC"></span>
-        </p>
-        <nz-tabset class="content" style="width: 100%;">
-          <nz-tab [nzTitle]="titleQuestions" style="margin-top: -16px;">
+          <span nz-typography nzCopyable nzEditable [nzContent]="poll.snippet" (nzContentChange)="onSnippetChange($event)"
+                [nzCopyText]="host + '/' + poll.snippet" class="snippet text-primary"></span>
+        </span>
+        <nz-tabset class="full-width">
+          <nz-tab [nzTitle]="titleQuestions" class="tab">
             <ng-template #titleQuestions>
-              <i nz-icon nzType="ordered-list"></i>Questions / Results
+              <i nz-icon nzType="ordered-list"></i>Questions
             </ng-template>
 
             <!-- List header -->
-            <nz-page-header style="margin-top: -16px;">
-              <nz-page-header-subtitle>Click on question for details</nz-page-header-subtitle>
+            <nz-page-header class="tab">
+              <nz-page-header-subtitle>
+                {{poll.pollItems.length > 0 ? 'Click on a question for details' :
+                'No questions yet. Click on the right to create one!'}}
+              </nz-page-header-subtitle>
               <nz-page-header-extra>
                 <button nz-button nzType="primary" (click)="showNewPollItemDialog = true">New question</button>
               </nz-page-header-extra>
             </nz-page-header>
             <!-- Poll item list -->
-            <nz-collapse class="poll-item-list" nzBordered="false" nzAccordion style="user-select: none;"
-                         *ngIf="poll.pollItems !== undefined && poll.pollItems !== null && poll.pollItems.length > 0"
-                         cdkDropList (cdkDropListDropped)="drop($event)">
-              <nz-collapse-panel class="poll-item" #p *ngFor="let pollItem of poll.pollItems" [nzHeader]="header"
-                                 [nzExtra]="options" [nzExpandedIcon]="expandedIcon" cdkDrag cdkDragLockAxis="y">
-                <!-- Item content -->
-                <div nz-row>
-                  <div nz-col nzSpan="12">
-                    <nz-statistic [nzValue]="(getAnswersCount(pollItem.id) | number)!" nzTitle="Total answers"></nz-statistic>
-                  </div>
-                  <div nz-col nzSpan="12">
-                    <ngx-charts-bar-horizontal class="chart" [view]="[0, 300]" [results]="getChartData(pollItem.id)"
-                                               scheme="forest" xAxis="true" yAxis="true" legend="true"
-                                               showXAxisLabel="true" showYAxisLabel="true" animations="true"
-                                               xAxisLabel="Participants" yAxisLabel="Answers"></ngx-charts-bar-horizontal>
-                  </div>
-                </div>
+            <ng-scrollbar class="scrollbar">
+              <div class="poll-item-list-container no-select" *ngIf="poll.pollItems.length > 0">
+                <nz-collapse class="poll-item-list" nzBordered="false" nzAccordion
+                             *ngIf="poll.pollItems !== undefined && poll.pollItems !== null && poll.pollItems.length > 0"
+                             cdkDropList (cdkDropListDropped)="drop($event)">
+                  <nz-collapse-panel class="poll-item" #p *ngFor="let pollItem of poll.pollItems" [nzHeader]="header"
+                                     [nzExtra]="options" [nzExpandedIcon]="expandedIcon" cdkDrag cdkDragLockAxis="y">
+                    <!-- Item content -->
+                    <div nz-row>
+                      <div nz-col nzSpan="9" class="stats-column">
+                        <nz-statistic [nzValue]="(getAnswersCount(pollItem.id) | number)!" nzTitle="Total answers">
+                        </nz-statistic>
+                      </div>
+                      <div nz-col nzSpan="15">
+                        <ngx-charts-bar-horizontal class="chart" [view]="[0, 300]" [results]="getChartData(pollItem.id)"
+                                                   scheme="forest" xAxis="true" yAxis="true" legend="true"
+                                                   showXAxisLabel="true" showYAxisLabel="true" animations="true"
+                                                   xAxisLabel="Participants" yAxisLabel="Answers">
+                        </ngx-charts-bar-horizontal>
+                      </div>
+                    </div>
+                    <button nz-button nzType="default" class="preview-button"
+                            [routerLink]="'/p/' + poll.snippet + '/' + pollItem.pos">
+                      Preview Question<i nz-icon nzType="right"></i>
+                    </button>
 
-                <!-- Header -->
-                <ng-template #header>
-                  <span [style]="'font-size: ' + (p.nzActive ? 'large' : 'small') + '; transition: font-size 0.4s; margin-left: 20px;'">
-                    {{pollItem.question}}
-                  </span>
-                </ng-template>
-                <!-- Header options -->
-                <ng-template #options>
-                  <nz-tag nzColor="default">{{pollItem.type}}</nz-tag>
-                  <button  nz-button nzType="primary" [nzSize]="p.nzActive ? 'default' : 'small'"
-                           [routerLink]="'/dashboard/my-polls/poll/' + poll.id + '/' + pollItem.id">
-                    Details<i nz-icon nzType="right"></i>
-                  </button>
-                </ng-template>
-                <!-- Expand icon -->
-                <ng-template #expandedIcon>
-                  <i nz-icon class="ant-collapse-arrow" cdkDragHandle
-                     style="margin-left: -5px; margin-right: 5px; cursor: move;">
-                    <img width="16" height="16" src="assets/images/drag_indicator.svg" alt="drag">
-                  </i>
-                  <i nz-icon nzType="right-circle" class="ant-collapse-arrow" [nzRotate]="p.nzActive ? 90 : 0"
-                     style="font-size: 16px; margin-left: 20px;"></i>
-                </ng-template>
-              </nz-collapse-panel>
-            </nz-collapse>
+                    <!-- Header -->
+                    <ng-template #header>
+                      <span class="poll-item-title">{{pollItem.question}}</span>
+                    </ng-template>
+                    <!-- Header options -->
+                    <ng-template #options>
+                      <nz-tag nzColor="default">{{pollItem.type}}</nz-tag>
+                      <button nz-button nzType="primary" [nzSize]="p.nzActive ? 'default' : 'small'"
+                              (click)="openEditPollItemDialog($event)">
+                        <i nz-icon nzType="edit"></i>Edit
+                      </button>
+                      <button nz-button nzType="dashed" nzDanger nz-popconfirm (click)="$event.stopPropagation()"
+                              nzPopconfirmTitle="Are you sure you want to delete this question?"
+                              (nzOnConfirm)="deletePollItem(pollItem.id)" nzPopconfirmPlacement="topLeft"
+                              [nzSize]="p.nzActive ? 'default' : 'small'" class="poll-item-delete">
+                        <i nz-icon nzType="delete"></i>Delete
+                      </button>
+                    </ng-template>
+                    <!-- Expand icon -->
+                    <ng-template #expandedIcon>
+                      <i nz-icon class="ant-collapse-arrow drag-handle" cdkDragHandle>
+                        <img width="16" height="16" src="assets/images/drag_indicator.svg" alt="drag">
+                      </i>
+                      <i nz-icon nzType="right" class="ant-collapse-arrow expand-icon"
+                         [nzRotate]="p.nzActive ? 90 : 0"></i>
+                    </ng-template>
+                  </nz-collapse-panel>
+                </nz-collapse>
+              </div>
+            </ng-scrollbar>
 
             <!-- No poll items -->
             <app-result-empty *ngIf="poll.pollItems === undefined || poll.pollItems.length === 0"
diff --git a/src/app/pages/poll/poll.component.sass b/src/app/pages/poll/poll.component.sass
index fa09112f..0dc97bfb 100644
--- a/src/app/pages/poll/poll.component.sass
+++ b/src/app/pages/poll/poll.component.sass
@@ -2,3 +2,57 @@
  / Copyright © Live-Poll 2020. All rights reserved
  /
 
+.tab
+  margin-top: -16px
+
+.scrollbar
+  max-height: calc(100vh - 350px)
+
+.poll-item-list-container
+  height: calc(100vh - 350px)
+  margin-right: 9px
+
+.poll-item-delete
+  margin-left: 5px
+
+.poll-item-title
+  margin-left: 20px
+
+.expand-icon
+  margin-left: 20px
+
+.stats-column
+  padding-left: 45px
+
+.chart
+  float: right
+
+.snippet
+  margin-left: -2px
+
+.preview-button
+  float: right
+  margin-top: 5px
+  margin-bottom: 10px
+
+// -------------- Drag & Drop CSS --------------
+
+.drag-handle
+  margin-top: -2px
+  margin-left: -5px
+  margin-right: 5px
+  cursor: move
+
+.cdk-drag-preview
+  box-sizing: border-box
+  border-radius: 4px
+  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12)
+
+.cdk-drag-placeholder
+  opacity: 0
+
+.cdk-drag-animating
+  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1)
+
+.poll-item-list.cdk-drop-list-dragging .poll-item:not(.cdk-drag-placeholder)
+  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1)
diff --git a/src/app/pages/poll/poll.component.ts b/src/app/pages/poll/poll.component.ts
index 20f647fd..9cb65925 100644
--- a/src/app/pages/poll/poll.component.ts
+++ b/src/app/pages/poll/poll.component.ts
@@ -2,7 +2,7 @@
  * Copyright © Live-Poll 2020. All rights reserved
  */
 
-import {Component, EventEmitter} from '@angular/core';
+import {Component, EventEmitter, Inject, LOCALE_ID} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Poll} from '../../model/poll';
 import {HttpClient, HttpHeaders, HttpResponse} from '@angular/common/http';
@@ -11,6 +11,8 @@ import {User} from '../../model/user';
 import {PollItem} from '../../model/poll-item';
 import {NzNotificationService} from 'ng-zorro-antd/notification';
 import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop';
+import {formatDate} from '@angular/common';
+import {CommonToolsService} from '../../service/common-tools.service';
 
 @Component({
   selector: 'app-poll',
@@ -34,6 +36,9 @@ export class PollComponent {
   showNewPollItemDialog = false;
   error = false;
   results = [];
+  pollStatus = 1; // 1 = Planned; 2 = Running; 3 = Finished
+  showEditPollDialog = false;
+  showEditPollItemDialog = false;
 
   /**
    * Initialize component
@@ -42,12 +47,16 @@ export class PollComponent {
    * @param router Injected router
    * @param http Injected http client
    * @param notificationService Injected notification service
+   * @param tools Injected tools service
+   * @param locale Injected local id
    */
   constructor(
     private activeRoute: ActivatedRoute,
     private router: Router,
     private http: HttpClient,
-    private notificationService: NzNotificationService
+    private notificationService: NzNotificationService,
+    private tools: CommonToolsService,
+    @Inject(LOCALE_ID) private locale: string
   ) {
     // Subscribe to own event emitters
     this.onUserDataChanged.subscribe(user => {
@@ -80,10 +89,20 @@ export class PollComponent {
    *
    * @param url Customized input url
    */
-  onUrlChange(url: string): void {
-    url = url === undefined ? '' : url;
-    this.poll.snippet = encodeURI(url.toLocaleLowerCase().split(' ').join('-'));
-    // TODO: Commit changes to server
+  onSnippetChange(url: string): void {
+    if (!url || url.length === 0) return;
+    const oldSnippet = this.poll.snippet;
+    const newSnippet = this.poll.snippet = encodeURI(url.toLocaleLowerCase().split(' ').join('-'));
+    // Commit changes to the server
+    // Build header, body and options
+    const header = new HttpHeaders().set('Content-Type', 'application/json');
+    const options: any = { header, observe: 'response', withCredentials: true };
+    const body = { newSnippet };
+    // Send request
+    this.http.put<string>(env.apiBaseUrl + '/users/' + this.userData.id + '/polls/' + this.pollId + '/snippet', body, options)
+      .subscribe((response: HttpResponse<string>) => {
+        if (!response.ok) this.poll.snippet = oldSnippet;
+      }, _ => this.poll.snippet = oldSnippet);
   }
 
   /**
@@ -94,15 +113,23 @@ export class PollComponent {
   changePollState(open: boolean): void {
     this.changingState = true;
     if (open) {
-      this.poll.startDate = this.poll.endDate = this.currentDate;
+      this.poll.startDate = this.currentDate;
+      if (this.poll.endDate.getTime() > 0) this.poll.endDate.setTime(0);
     } else {
       this.poll.endDate = this.currentDate;
     }
-    this.updatePoll(() => this.changingState = false);
+    this.updatePoll(() => {
+      this.changingState = false;
+      this.pollStatus = this.tools.getPollStatus(this.poll);
+    }, () => {
+      // TODO: Remove this later
+      this.changingState = false;
+      this.pollStatus = this.tools.getPollStatus(this.poll);
+    });
   }
 
   /**
-   * Is called when the NewPollItemDialog is closed. Triggers an poll reload, if the creation of an item was sucessful
+   * Is called when the NewPollItemDialog was closed. Triggers a poll reload, if the creation of an item was successful
    *
    * @param success Item successfully created
    */
@@ -115,7 +142,11 @@ export class PollComponent {
    * Loads a single poll from the server
    */
   loadPoll(): void {
-    console.log('Loading');
+    // Redirect to MyPolls page, if some data is missing to load the poll
+    if (!this.userData || !this.pollId) {
+      this.router.navigateByUrl('/dashboard/my-polls');
+      return;
+    }
     // Build header, body and options
     const header = new HttpHeaders().set('Content-Type', 'application/json');
     const options: any = { header, responseType: 'application/json', observe: 'response', withCredentials: true };
@@ -130,6 +161,7 @@ export class PollComponent {
           poll.name = json.name;
           poll.startDate = new Date(json.startDate);
           poll.endDate = new Date(json.endDate);
+          poll.snippet = json.snippet;
           poll.pollItems = [];
           json.pollItems.forEach(item => {
             const pollItem = new PollItem();
@@ -183,6 +215,22 @@ export class PollComponent {
       });
   }
 
+  /**
+   * Deletes a single poll item from the server
+   *
+   * @param pollItemId Id of the poll item
+   */
+  deletePollItem(pollItemId: number): void {
+    // Build header, body and options
+    const header = new HttpHeaders().set('Content-Type', 'application/json');
+    const options: any = { header, observe: 'response', withCredentials: true };
+    // Send request
+    this.http.delete<string>(env.apiBaseUrl + '/users/' + this.userData.id + '/polls/' + this.pollId + '/item/' + pollItemId, options)
+      .subscribe((response: HttpResponse<string>) => {
+        if (response.ok) this.loadPoll();
+      });
+  }
+
   /**
    * Shows an error message with a custom message
    *
@@ -219,7 +267,56 @@ export class PollComponent {
     return this.getChartData(pollId).reduce((sum, current) => sum + current.value, 0);
   }
 
+  /**
+   * Generates the subtitle string for the poll, consisting of either start and end date or placeholder strings.
+   * The calculation is based on the status and the startDate and endDate
+   */
+  getSubtitle(): string {
+    const startDate = this.poll.startDate;
+    const endDate = this.poll.endDate;
+    const startDateString = '<strong>' + formatDate(startDate, 'yyyy-MM-dd hh:mm a', this.locale) + '</strong>';
+    const endDateString = '<strong>' + formatDate(endDate, 'yyyy-MM-dd hh:mm a', this.locale) + '</strong>';
+
+    switch (this.pollStatus) {
+      case 1: { // Pending
+        if (startDate.getTime() === 0 && endDate.getTime() === 0) return 'Manual opening, manual closing';
+        if (startDate.getTime() === 0) return 'Manual opening, automatically closing at' + endDateString;
+        if (endDate.getTime() === 0) return 'Automatically opening at ' + startDateString + ', manual closing';
+        return 'Automatically opening at ' + startDateString + ', automatically closing at ' + endDateString;
+      }
+      case 2: { // Running
+        if (endDate.getTime() === 0) return 'Running since ' + startDateString + ', manual closing';
+        return 'Running since ' + startDateString + ', automatically closing at ' + endDateString;
+      }
+      case 3: { // Finished
+        return 'Poll ran from ' + startDateString + ' to ' + endDateString;
+      }
+      default: return ''; // Unknown state, return empty string
+    }
+  }
+
+  /**
+   * Shows the dialog for editing the current poll
+   */
+  openEditPollDialog(): void {
+    // Open edit dialog
+    this.showEditPollDialog = true;
+  }
+
+  /**
+   * Shows the dialog a specific poll item
+   */
+  openEditPollItemDialog(event: any): void {
+    event.stopPropagation();
+    // Open edit dialog
+    this.showEditPollItemDialog = true;
+  }
+
+  /**
+   * Establish socket connection to the server to ensure data exchange in realtime
+   */
   setupResultObserver(): void {
+    // TODO: Remove this mocked data later on
     this.results = [];
     this.poll.pollItems.forEach(pollItem => {
       this.results.push({
diff --git a/src/app/pages/poll/poll.module.ts b/src/app/pages/poll/poll.module.ts
index ed4f8844..0391701d 100644
--- a/src/app/pages/poll/poll.module.ts
+++ b/src/app/pages/poll/poll.module.ts
@@ -33,39 +33,41 @@ 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 {NgScrollbarModule} from 'ngx-scrollbar';
 
 @NgModule({
   declarations: [PollComponent],
-  imports: [
-    PollRoutingModule,
-    CommonModule,
-    NzAvatarModule,
-    NzDropDownModule,
-    NzPageHeaderModule,
-    NzBreadCrumbModule,
-    NzButtonModule,
-    NzIconModule,
-    NzNoAnimationModule,
-    NzGridModule,
-    NzTagModule,
-    NzLayoutModule,
-    RouterModule,
-    MyPollsModule,
-    NzTabsModule,
-    ResultEmptyModule,
-    NzTypographyModule,
-    NzInputModule,
-    FormsModule,
-    NzToolTipModule,
-    NzCardModule,
-    NzListModule,
-    ResultErrorModule,
-    NzSpinModule,
-    NzPopconfirmModule,
-    NzCollapseModule,
-    DragDropModule,
-    NgxChartsModule,
-    NzStatisticModule
-  ]
+    imports: [
+        PollRoutingModule,
+        CommonModule,
+        NzAvatarModule,
+        NzDropDownModule,
+        NzPageHeaderModule,
+        NzBreadCrumbModule,
+        NzButtonModule,
+        NzIconModule,
+        NzNoAnimationModule,
+        NzGridModule,
+        NzTagModule,
+        NzLayoutModule,
+        RouterModule,
+        MyPollsModule,
+        NzTabsModule,
+        ResultEmptyModule,
+        NzTypographyModule,
+        NzInputModule,
+        FormsModule,
+        NzToolTipModule,
+        NzCardModule,
+        NzListModule,
+        ResultErrorModule,
+        NzSpinModule,
+        NzPopconfirmModule,
+        NzCollapseModule,
+        DragDropModule,
+        NgxChartsModule,
+        NzStatisticModule,
+        NgScrollbarModule
+    ]
 })
 export class PollModule { }
diff --git a/src/app/pages/sign-up/sign-up.component.html b/src/app/pages/sign-up/sign-up.component.html
index 35f7cbd1..5896dbda 100644
--- a/src/app/pages/sign-up/sign-up.component.html
+++ b/src/app/pages/sign-up/sign-up.component.html
@@ -40,7 +40,7 @@ <h3>Create an account:</h3>
           <nz-form-item>
             <nz-form-control class="agb-checkbox" nzErrorTip="Accepting the agreement is mandatory!">
               <label nz-checkbox formControlName="agb">
-                <span style="margin-right: -5px">I have read the</span>
+                <span class="agb-label">I have read the</span>
               </label>
               <a href="https://www.chillibits.com/en/legal-notice/" target="_blank" rel="noopener noreferrer">license agreement</a>
               <span class="required-field"> *</span>
diff --git a/src/app/pages/sign-up/sign-up.component.sass b/src/app/pages/sign-up/sign-up.component.sass
index cd319025..cff94c37 100644
--- a/src/app/pages/sign-up/sign-up.component.sass
+++ b/src/app/pages/sign-up/sign-up.component.sass
@@ -36,3 +36,6 @@ h3
   color: grey
   margin-bottom: 15px
   text-align: center
+
+.agb-label
+  margin-right: -5px
diff --git a/src/app/service/common-tools.service.spec.ts b/src/app/service/common-tools.service.spec.ts
new file mode 100644
index 00000000..41f2ba8d
--- /dev/null
+++ b/src/app/service/common-tools.service.spec.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
+import {TestBed} from '@angular/core/testing';
+
+import {CommonToolsService} from './common-tools.service';
+
+describe('CommonToolsService', () => {
+  let service: CommonToolsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(CommonToolsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/service/common-tools.service.ts b/src/app/service/common-tools.service.ts
new file mode 100644
index 00000000..f6cfda5f
--- /dev/null
+++ b/src/app/service/common-tools.service.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright © Live-Poll 2020. All rights reserved
+ */
+
+import {Injectable} from '@angular/core';
+import {Poll} from '../model/poll';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CommonToolsService {
+
+  /**
+   * Calculates the status of the poll, based on the startDate and endDate
+   */
+  getPollStatus(poll: Poll): number {
+    const startDate = poll.startDate;
+    const endDate = poll.endDate;
+    const currentDate = new Date();
+
+    if (
+      (startDate.getTime() === 0 && endDate.getTime() === 0) || // Manual opening, manual closing
+      (startDate > currentDate) // Start date not reached
+    ) {
+      // Poll is pending
+      return 1;
+    } else if (
+      (startDate <= currentDate && endDate > currentDate) || // We're in between of the two dates
+      (startDate <= currentDate && endDate.getTime() === 0) // Started, manual closing
+    ) {
+      // Poll is running
+      return 2;
+    } else if (
+      (endDate < currentDate) // End date already reached
+    ) {
+      // Poll is finished
+      return 3;
+    } else {
+      // Invalid status, something went wrong
+      return 0;
+    }
+  }
+}
diff --git a/src/electron/main.js b/src/electron/main.js
index baf8d26e..12d949e5 100644
--- a/src/electron/main.js
+++ b/src/electron/main.js
@@ -18,8 +18,8 @@ let mainWindow
 function createWindow () {
   // Create the browser window.
   mainWindow = new BrowserWindow({
-    width: 1000,
-    height: 800,
+    width: 1200,
+    height: 900,
     webPreferences: {
       nodeIntegration: true
     }
diff --git a/src/index.html b/src/index.html
index ef327841..f64ed0b9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -16,7 +16,9 @@
   <body>
     <!-- Main app -->
     <app-root></app-root>
-    <!-- Theme, please enter default here -->
+    <!-- Themes, the second is the default one, because it overrides the first. Both stylesheets are included
+    initially for fast theme changes -->
+    <link type="text/css" rel="stylesheet" id="dark-theme" href="assets/themes/dark.css">
     <link type="text/css" rel="stylesheet" id="light-theme" href="assets/themes/light.css">
   </body>
 </html>
diff --git a/src/styles.sass b/src/styles.sass
index 7a411087..ff3def63 100644
--- a/src/styles.sass
+++ b/src/styles.sass
@@ -43,16 +43,17 @@ app-waves
   justify-content: center
   align-items: center
 
-.cdk-drag-preview
-  box-sizing: border-box
-  border-radius: 4px
-  box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12)
+.page-content
+  margin-top: 10px
 
-.cdk-drag-placeholder
-  opacity: 0
+.text-primary
+  color: #38C6BC !important
 
-.cdk-drag-animating
-  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1)
+.full-width
+  width: 100%
 
-.poll-item-list.cdk-drop-list-dragging .poll-item:not(.cdk-drag-placeholder)
-  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1)
+.full-height
+  height: 100%
+
+.cursor-pointer
+  cursor: pointer
diff --git a/src/theme.dark.less b/src/theme.dark.less
index 288df800..b34b0894 100644
--- a/src/theme.dark.less
+++ b/src/theme.dark.less
@@ -25,6 +25,7 @@
 
 .sidebar-logo {
   background: #222;
+  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
   h1 {
     color: @white;
   }
@@ -50,6 +51,6 @@ body, nz-content {
 
 ngx-charts-bar-horizontal {
   text {
-    fill: white;
+    fill: @white;
   }
 }
diff --git a/src/theme.light.less b/src/theme.light.less
index c57dc0d2..181c0eab 100644
--- a/src/theme.light.less
+++ b/src/theme.light.less
@@ -25,9 +25,7 @@
 
 .sidebar-logo {
   background: @white;
-  border-width: 0 0 1px 0;
-  border-color: lightgray;
-  border-style: solid;
+  box-shadow: 0 2px 5px 0 rgba(50, 50, 50, 0.5);
   h1 {
     color: @primary-color;
   }
@@ -48,6 +46,6 @@ nz-content {
 
 ngx-charts-bar-horizontal {
   text {
-    fill: black;
+    fill: @black;
   }
 }