diff --git a/appinfo/routes.php b/appinfo/routes.php
index 8c710330e..46bc82aca 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -24,9 +24,10 @@
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'page#list', 'url' => '/list/{pollId}', 'verb' => 'GET'],
-		['name' => 'page#polls', 'url' => '/vote/{pollId}', 'verb' => 'GET'],
+		['name' => 'page#list', 'url' => '/list/{id}', 'verb' => 'GET'],
+		['name' => 'page#polls', 'url' => '/vote/{id}', 'verb' => 'GET'],
 		['name' => 'page#vote_public', 'url' => '/s/{token}', 'verb' => 'GET'],
+		['name' => 'page#old_vote_public', 'url' => '/poll/{token}', 'verb' => 'GET'],
 
 		['name' => 'subscription#get', 'url' => '/subscription/get/{pollId}', 'verb' => 'GET'],
 		['name' => 'subscription#set', 'url' => '/subscription/set/', 'verb' => 'POST'],
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index c2085fe40..d0f6a503f 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -88,7 +88,19 @@ public function list() {
 	 * @param string $token
 	 * @return PublicTemplateResponse
 	 */
-	public function votePublic(/** @scrutinizer ignore-unused */ $token) {
+	public function votePublic() {
+		return new PublicTemplateResponse('polls', 'polls.tmpl', [
+			'urlGenerator' => $this->urlGenerator]);
+	}
+
+	/**
+	 * @PublicPage
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 * @param string $token
+	 * @return PublicTemplateResponse
+	 */
+	public function oldVotePublic() {
 		return new PublicTemplateResponse('polls', 'polls.tmpl', [
 			'urlGenerator' => $this->urlGenerator]);
 	}
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index 0904123f8..0c82628c5 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -153,7 +153,7 @@ public function write($pollId, $share) {
 		$newShare->setType($share['type']);
 		$newShare->setPollId($share['pollId']);
 		$newShare->setUserId($share['userId']);
-		$newShare->setUserEmail($share['userEmail']);
+		$newShare->setUserEmail(isset($share['userEmail']) ? $share['userEmail'] : '' ,);
 		$newShare->setToken(\OC::$server->getSecureRandom()->generate(
 			16,
 			ISecureRandom::CHAR_DIGITS .
diff --git a/src/js/components/Base/ParticipantsList.vue b/src/js/components/Base/ParticipantsList.vue
index a5c28bf54..ac160d59c 100644
--- a/src/js/components/Base/ParticipantsList.vue
+++ b/src/js/components/Base/ParticipantsList.vue
@@ -22,9 +22,14 @@
 
 <template>
 	<div class="participants-list">
-		<h2>{{ t('polls','Participants') }}</h2>
-		<div class="participants">
-			<userDiv v-for="(participant) in participants"
+		<h2 v-if="participantsVoted.length">
+			{{ t('polls','Participants') }}
+		</h2>
+		<h2 v-else>
+			{{ t('polls','No Participants until now') }}
+		</h2>
+		<div v-if="participantsVoted.length" class="participants">
+			<userDiv v-for="(participant) in participantsVoted"
 				:key="participant"
 				:hide-names="true"
 				:user-id="participant"
@@ -53,7 +58,7 @@ export default {
 		}),
 
 		...mapGetters([
-			'participants'
+			'participantsVoted'
 		])
 
 	}
diff --git a/src/js/components/Base/PollInformation.vue b/src/js/components/Base/PollInformation.vue
index 6c22627f5..2ab6e913e 100644
--- a/src/js/components/Base/PollInformation.vue
+++ b/src/js/components/Base/PollInformation.vue
@@ -27,7 +27,7 @@
 		<span v-if="expired">{{ t('polls', 'Voting is no more possible, because this poll expired since %n.', 1, moment.unix(poll.expire).format('LLLL')) }}</span>
 		<span v-if="!expired && poll.expire && acl.allowVote">{{ t('polls', 'You can place your vote until %n. ', 1, moment.unix(poll.expire).format('LLLL')) }}</span>
 		<span v-if="poll.anonymous">{{ t('polls', 'The names of other participants are hidden, as this is an anonymous poll. ') }}</span>
-		<span>{{ n('polls', '%n person participated in this poll until now.', '%n persons participated in this poll until now.', participants.length) }}</span>
+		<span>{{ n('polls', '%n person participated in this poll until now.', '%n persons participated in this poll until now.', participantsVoted.length) }}</span>
 	</div>
 </template>
 
@@ -49,7 +49,7 @@ export default {
 		}),
 
 		...mapGetters([
-			'participants',
+			'participantsVoted',
 			'expired'
 		])
 	}
diff --git a/src/js/components/Create/CreateDlg.vue b/src/js/components/Create/CreateDlg.vue
index 3964dfa80..6730bc3b0 100644
--- a/src/js/components/Create/CreateDlg.vue
+++ b/src/js/components/Create/CreateDlg.vue
@@ -23,8 +23,8 @@
 <template lang="html">
 	<div class="create-dialog">
 		<h2>{{ t('polls', 'Create new poll') }}</h2>
-		<input id="pollTitle" v-model="title" type="text"
-			:placeholder="t('polls', 'Enter Title')">
+		<input id="pollTitle" ref="pollTitle" v-model="title"
+			type="text" :placeholder="t('polls', 'Enter Title')" @keyup.enter="confirm">
 
 		<div class="config-box">
 			<label class="title icon-checkmark">
@@ -101,6 +101,12 @@ export default {
 				.catch(() => {
 					OC.Notification.showTemporary(t('polls', 'Error while creating Poll "%n"', 1, this.poll.title), { type: 'error' })
 				})
+		},
+
+		setFocus() {
+			this.$nextTick(() => {
+				this.$refs.pollTitle.focus()
+			})
 		}
 	}
 
diff --git a/src/js/components/Navigation/Navigation.vue b/src/js/components/Navigation/Navigation.vue
index dd2678587..be07f1d3a 100644
--- a/src/js/components/Navigation/Navigation.vue
+++ b/src/js/components/Navigation/Navigation.vue
@@ -23,7 +23,7 @@
 <template lang="html">
 	<AppNavigation>
 		<AppNavigationNew :text="t('polls', 'Add new Poll')" @click="toggleCreateDlg" />
-		<CreateDlg v-show="createDlg" @closeCreate="closeCreate()" />
+		<CreateDlg v-show="createDlg" ref="createDlg" @closeCreate="closeCreate()" />
 		<ul>
 			<AppNavigationItem :title="t('polls', 'All polls')" :allow-collapse="true"
 				icon="icon-folder" :to="{ name: 'list', params: {type: 'all'}}" :open="true">
@@ -130,6 +130,13 @@ export default {
 			this.createDlg = false
 		},
 
+		toggleCreateDlg() {
+			this.createDlg = !this.createDlg
+			if (this.createDlg) {
+				this.$refs.createDlg.setFocus()
+			}
+		},
+
 		clonePoll(pollId) {
 			this.$store
 				.dispatch('clonePoll', { pollId: pollId })
@@ -148,10 +155,6 @@ export default {
 
 		},
 
-		toggleCreateDlg() {
-			this.createDlg = !this.createDlg
-		},
-
 		refreshPolls() {
 			if (this.$route.name !== 'publicVote') {
 
diff --git a/src/js/components/SideBar/SideBar.vue b/src/js/components/SideBar/SideBar.vue
index 5710f6843..0fed5bd61 100644
--- a/src/js/components/SideBar/SideBar.vue
+++ b/src/js/components/SideBar/SideBar.vue
@@ -21,21 +21,25 @@
   -->
 
 <template>
-	<AppSidebar ref="sideBar" :title="t('polls', 'Details')" @close="$emit('closeSideBar')">
-		<AppSidebarTab :name="t('polls', 'Comments')" icon="icon-comment">
-			<Comments />
+	<AppSidebar ref="sideBar" :active="active" :title="t('polls', 'Details')"
+		@close="$emit('closeSideBar')">
+		<AppSidebarTab v-if="acl.allowEdit" :order="1" :name="t('polls', 'Configuration')"
+			icon="icon-settings">
+			<SideBarTabConfiguration />
 		</AppSidebarTab>
 
-		<AppSidebarTab v-if="acl.allowEdit" :name="t('polls', 'options')" icon="icon-toggle-filelist">
+		<AppSidebarTab v-if="acl.allowEdit" :order="2" :name="t('polls', 'Options')"
+			icon="icon-toggle-filelist">
 			<SideBarTabOptions />
 		</AppSidebarTab>
 
-		<AppSidebarTab v-if="acl.allowEdit" :name="t('polls', 'Configuration')" icon="icon-settings">
-			<SideBarTabConfiguration />
+		<AppSidebarTab v-if="acl.allowEdit" :order="3" :name="t('polls', 'Shares')"
+			icon="icon-share">
+			<SideBarTabShare />
 		</AppSidebarTab>
 
-		<AppSidebarTab v-if="acl.allowEdit" :name="t('polls', 'Shares')" icon="icon-share">
-			<SideBarTabShare />
+		<AppSidebarTab :order="4" :name="t('polls', 'Comments')" icon="icon-comment">
+			<Comments />
 		</AppSidebarTab>
 	</AppSidebar>
 </template>
@@ -51,6 +55,7 @@ import { mapState } from 'vuex'
 
 export default {
 	name: 'SideBar',
+
 	components: {
 		SideBarTabConfiguration,
 		Comments,
@@ -60,6 +65,13 @@ export default {
 		AppSidebarTab
 	},
 
+	props: {
+		active: {
+			type: String,
+			default: t('polls', 'Comments').toLowerCase()
+		}
+	},
+
 	computed: {
 		...mapState({
 			poll: state => state.poll,
diff --git a/src/js/components/VoteTable/VoteList.vue b/src/js/components/VoteTable/VoteList.vue
index 008911b4d..256b12c5a 100644
--- a/src/js/components/VoteTable/VoteList.vue
+++ b/src/js/components/VoteTable/VoteList.vue
@@ -70,7 +70,7 @@ export default {
 
 		...mapGetters([
 			'sortedOptions',
-			'participants',
+			'participantsVoted',
 			'votesRank',
 			'expired'
 		]),
@@ -100,7 +100,7 @@ export default {
 		},
 
 		noVotes(pollOptionText) {
-			return this.participants.length - this.maybeVotes(pollOptionText) - this.yesVotes(pollOptionText)
+			return this.participantsVoted.length - this.maybeVotes(pollOptionText) - this.yesVotes(pollOptionText)
 		},
 
 		setVote(option, participant) {
diff --git a/src/js/router.js b/src/js/router.js
index 9eb264287..d11cbc711 100644
--- a/src/js/router.js
+++ b/src/js/router.js
@@ -63,6 +63,10 @@ export default new Router({
 			props: true,
 			name: 'vote'
 		},
+		{
+			path: '/poll/:token',
+			redirect: '/s/:token'
+		},
 		{
 			path: '/s/:token',
 			components: {
diff --git a/src/js/store/modules/votes.js b/src/js/store/modules/votes.js
index 7576282c9..0c37b3341 100644
--- a/src/js/store/modules/votes.js
+++ b/src/js/store/modules/votes.js
@@ -63,6 +63,10 @@ const getters = {
 		}
 	},
 
+	participantsVoted: (state, getters) => {
+		return [...new Set(state.list.map(item => item.userId))]
+	},
+
 	participants: (state, getters, rootState) => {
 		const list = []
 		state.list.forEach(function(vote) {
@@ -71,7 +75,7 @@ const getters = {
 			}
 		})
 
-		if (!list.includes(rootState.acl.userId) && rootState.acl.userId !== null) {
+		if (!list.includes(rootState.acl.userId) && rootState.acl.userId && rootState.acl.allowVote) {
 			list.push(rootState.acl.userId)
 		}
 
diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue
index 53f1e9ea3..50d8663e8 100644
--- a/src/js/views/Vote.vue
+++ b/src/js/views/Vote.vue
@@ -37,7 +37,9 @@
 			<VoteTable v-show="tableMode && options.list.length" />
 			<div v-if="!options.list.length" class="emptycontent">
 				<div class="icon-toggle-filelist" />
-				<p> {{ t('polls', 'There are no vote options, add some.') }}</p>
+				<button @click="openOptions">
+					{{ t('polls', 'There are no vote options, add some in the options section of the right side bar.') }}
+				</button>
 			</div>
 
 			<Subscription />
@@ -47,7 +49,7 @@
 			</div>
 		</div>
 
-		<SideBar v-if="sideBarOpen" @closeSideBar="toggleSideBar" />
+		<SideBar v-if="sideBarOpen" :active="activeTab" @closeSideBar="toggleSideBar" />
 		<LoadingOverlay v-if="isLoading" />
 	</AppContent>
 </template>
@@ -90,7 +92,8 @@ export default {
 			isLoading: false,
 			initialTab: 'comments',
 			newName: '',
-			tableMode: true
+			tableMode: true,
+			activeTab: t('polls', 'Comments').toLowerCase()
 		}
 	},
 
@@ -118,6 +121,16 @@ export default {
 	},
 
 	methods: {
+		openOptions() {
+			this.sideBarOpen = true
+			this.activeTab = t('polls', 'Options').toLowerCase()
+		},
+
+		openConfiguration() {
+			this.sideBarOpen = true
+			this.activeTab = t('polls', 'Configuration').toLowerCase()
+		},
+
 		loadPoll() {
 			this.isLoading = true
 			this.$store.dispatch({ type: 'loadPollMain', pollId: this.$route.params.id })
@@ -125,7 +138,7 @@ export default {
 					this.$store.dispatch({ type: 'loadPoll', pollId: this.$route.params.id })
 						.then(() => {
 							if (this.acl.allowEdit && moment.unix(this.poll.created).diff() > -10000) {
-								this.sideBarOpen = true
+								this.openConfiguration()
 							}
 							this.isLoading = false
 						})