diff --git a/src/js/App.vue b/src/js/App.vue
index 355f896a1..65dc10006 100644
--- a/src/js/App.vue
+++ b/src/js/App.vue
@@ -84,6 +84,36 @@ export default {
 	margin: 8px 0;
 }
 
+.poll-item {
+	display: flex;
+	align-items: center;
+	padding-left: 8px;
+	padding-right: 8px;
+	line-height: 2em;
+	min-height: 4em;
+	overflow: visible;
+	white-space: nowrap;
+
+	&:active,
+	&:hover {
+		transition: var(--background-dark) 0.3s ease;
+		background-color: var(--color-background-dark);
+	}
+
+	> div {
+		display: flex;
+		flex: 1;
+		font-size: 1.2em;
+		opacity: 1;
+		white-space: normal;
+		padding-right: 4px;
+		&.avatar {
+			flex: 0;
+		}
+	}
+
+}
+
 .list-enter-active,
 .list-leave-active {
 	transition: all 0.5s ease;
@@ -160,4 +190,38 @@ export default {
 		}
 	}
 }
+
+.config-box {
+	display: flex;
+	flex-direction: column;
+	padding: 8px;
+	& > * {
+		padding-left: 21px;
+	}
+
+	& > input {
+		margin-left: 24px;
+		width: auto;
+
+	}
+
+	& > textarea {
+		margin-left: 24px;
+		width: auto;
+		padding: 7px 6px;
+	}
+
+	& > .title {
+		display: flex;
+		background-position: 0 2px;
+		padding-left: 24px;
+		opacity: 0.7;
+		font-weight: bold;
+		margin-bottom: 4px;
+		& > span {
+			padding-left: 4px;
+		}
+	}
+}
+
 </style>
diff --git a/src/js/components/Base/PollItemDate.vue b/src/js/components/Base/PollItemDate.vue
index a504ccec7..765bd54d9 100644
--- a/src/js/components/Base/PollItemDate.vue
+++ b/src/js/components/Base/PollItemDate.vue
@@ -53,39 +53,3 @@ export default {
 	}
 }
 </script>
-
-<style lang="scss">
-	.poll-item {
-		display: flex;
-		align-items: center;
-		padding-left: 8px;
-		padding-right: 8px;
-		line-height: 2em;
-		min-height: 4em;
-		overflow: visible;
-		white-space: nowrap;
-
-		&:active,
-		&:hover {
-			transition: var(--background-dark) 0.3s ease;
-			background-color: var(--color-background-dark);
-		}
-
-		> div {
-			display: flex;
-			flex: 1;
-			// font-size: 1.2em;
-			opacity: 1;
-			white-space: normal;
-			padding-right: 4px;
-			&.avatar {
-				flex: 0;
-			}
-		}
-
-		.action {
-			justify-content: center;
-			flex: 0 0;
-		}
-	}
-</style>
diff --git a/src/js/components/Base/PollItemText.vue b/src/js/components/Base/PollItemText.vue
index 45710bee2..a3bec2a1c 100644
--- a/src/js/components/Base/PollItemText.vue
+++ b/src/js/components/Base/PollItemText.vue
@@ -69,32 +69,12 @@ export default {
 </script>
 
 <style lang="scss">
-	.poll-item {
-		display: flex;
-		align-items: center;
-		padding-left: 8px;
-		padding-right: 8px;
-		line-height: 2em;
-		min-height: 4em;
-		overflow: visible;
-		white-space: nowrap;
-		&:active,
-		&:hover {
-			transition: var(--background-dark) 0.3s ease;
-			background-color: var(--color-background-dark);
-		}
 
-		> div {
-			display: flex;
-			flex: 1;
-			font-size: 1.2em;
-			opacity: 1;
-			white-space: normal;
-			padding-right: 4px;
-			&.avatar {
-				flex: 0;
-			}
-		}
+	.draggable .pollOption {
+		cursor: grab;
+	}
+
+	.poll-item {
 
 		.order {
 			flex: 0 0;
@@ -106,9 +86,5 @@ export default {
 			margin-right: 8px;
 		}
 
-		.action {
-			justify-content: center;
-			flex: 0 0;
-		}
 	}
 </style>
diff --git a/src/js/components/Base/UserDiv.vue b/src/js/components/Base/UserDiv.vue
index bb40e63ab..02d4bee4d 100644
--- a/src/js/components/Base/UserDiv.vue
+++ b/src/js/components/Base/UserDiv.vue
@@ -22,9 +22,6 @@
 
 <template>
 	<div class="user-row" :class="type">
-		<div v-if="description" class="description">
-			{{ description }}
-		</div>
 		<Avatar :disable-menu="disableMenu" :menu-position="menuPosition" :user="userId"
 			:is-guest="!Boolean(OC.currentUser)"
 			:display-name="displayName"
@@ -74,10 +71,6 @@ export default {
 			type: String,
 			default: 'user'
 		},
-		description: {
-			type: String,
-			default: ''
-		},
 		icon: {
 			type: Boolean,
 			default: false
@@ -143,6 +136,7 @@ export default {
 	.user-name {
 		opacity: 0.5;
 		flex: 1;
+		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
diff --git a/src/js/components/Comments/CommentAdd.vue b/src/js/components/Comments/CommentAdd.vue
index 9c0c723e7..f072dcbd9 100644
--- a/src/js/components/Comments/CommentAdd.vue
+++ b/src/js/components/Comments/CommentAdd.vue
@@ -22,7 +22,7 @@
 
 <template lang="html">
 	<div class="comment">
-		<UserDiv :user-id="acl.userId" :focus="true" :display-name="acl.DisplayName" />
+		<UserDiv :user-id="acl.userId" :focus="true" :display-name="acl.displayName" />
 		<InputDiv v-model="comment" class="addComment" :placeholder="t('polls', 'New comment …')"
 			@input="writeComment()" />
 	</div>
diff --git a/src/js/components/Navigation/Navigation.vue b/src/js/components/Navigation/Navigation.vue
index 287e66492..34976e1cc 100644
--- a/src/js/components/Navigation/Navigation.vue
+++ b/src/js/components/Navigation/Navigation.vue
@@ -29,8 +29,12 @@
 				:title="pollCategory.title" :allow-collapse="true" :pinned="pollCategory.pinned"
 				:icon="pollCategory.icon" :to="{ name: 'list', params: {type: pollCategory.id}}" :open="false">
 				<ul>
-					<PollNavigationItems v-for="(poll) in filteredPolls(pollCategory.id)" :key="poll.id" :poll="poll"
-						@switchDeleted="switchDeleted(poll.id)" @clonePoll="clonePoll(poll.id)"
+					<PollNavigationItems v-for="(poll) in filteredPolls(pollCategory.id)"
+						:key="poll.id"
+						:poll="poll"
+						:class="{ expired: (poll.expire > 0 && moment.unix(poll.expire).diff() < 0) }"
+						@switchDeleted="switchDeleted(poll.id)"
+						@clonePoll="clonePoll(poll.id)"
 						@deletePermanently="deletePermanently(poll.id)" />
 				</ul>
 			</AppNavigationItem>
@@ -170,3 +174,9 @@ export default {
 	}
 }
 </script>
+
+<style lang="scss" scoped>
+	.expired {
+		opacity: 0.3;
+	}
+</style>
diff --git a/src/js/components/SideBar/SideBar.vue b/src/js/components/SideBar/SideBar.vue
index a9a6817f0..335d5700c 100644
--- a/src/js/components/SideBar/SideBar.vue
+++ b/src/js/components/SideBar/SideBar.vue
@@ -84,37 +84,23 @@ export default {
 
 </script>
 
-<style lang="scss">
-.config-box {
-	display: flex;
-	flex-direction: column;
-	padding: 8px;
-	& > * {
-		padding-left: 21px;
-	}
-
-	& > input {
-		margin-left: 24px;
-		width: auto;
-
-	}
-
-	& > textarea {
-		margin-left: 24px;
-		width: auto;
-		padding: 7px 6px;
+<style lang="scss" scoped>
+	.modal__content {
+		padding: 14px;
+		display: flex;
+		flex-direction: column;
+		color: var(--color-main-text);
+		input {
+			width: 100%;
+		}
 	}
 
-	& > .title {
+	.modal__buttons {
 		display: flex;
-		background-position: 0 2px;
-		padding-left: 24px;
-		opacity: 0.7;
-		font-weight: bold;
-		margin-bottom: 4px;
-		& > span {
-			padding-left: 4px;
+		justify-content: end;
+		.button {
+			margin-left: 10px;
+			margin-right: 0;
 		}
 	}
-}
 </style>
diff --git a/src/js/components/SideBar/SideBarTabOptionsDate.vue b/src/js/components/SideBar/SideBarTabOptionsDate.vue
index d3815382a..475aa124c 100644
--- a/src/js/components/SideBar/SideBarTabOptionsDate.vue
+++ b/src/js/components/SideBar/SideBarTabOptionsDate.vue
@@ -23,7 +23,7 @@
 <template>
 	<div>
 		<div class="config-box">
-			<label class="title icon-calendar">
+			<label class="title icon-add">
 				{{ t('polls', 'Add a date option') }}
 			</label>
 			<DatetimePicker v-model="lastOption"
@@ -53,28 +53,30 @@
 			</div>
 		</div>
 
-		<ul class="config-box poll-table">
-			<label class="title icon-calendar">
+		<div class="config-box">
+			<label class="title icon-calendar-000">
 				{{ t('polls', 'Available Options') }}
 			</label>
-			<PollItemDate v-for="(option) in sortedOptions"
-				:key="option.id"
-				:option="option">
-				<template v-slot:actions>
-					<Actions v-if="acl.allowEdit" class="action">
-						<ActionButton icon="icon-delete" @click="removeOption(option)">
-							{{ t('polls', 'Delete option') }}
-						</ActionButton>
-					</Actions>
-
-					<Actions v-if="acl.allowEdit" class="action">
-						<ActionButton icon="icon-add" @click="cloneOptionModal(option)">
-							{{ t('polls', 'Clone option') }}
-						</ActionButton>
-					</Actions>
-				</template>
-			</PollItemDate>
-		</ul>
+			<ul class="">
+				<PollItemDate v-for="(option) in sortedOptions"
+					:key="option.id"
+					:option="option">
+					<template v-slot:actions>
+						<Actions v-if="acl.allowEdit" class="action">
+							<ActionButton icon="icon-delete" @click="removeOption(option)">
+								{{ t('polls', 'Delete option') }}
+							</ActionButton>
+						</Actions>
+
+						<Actions v-if="acl.allowEdit" class="action">
+							<ActionButton icon="icon-add" @click="cloneOptionModal(option)">
+								{{ t('polls', 'Clone option') }}
+							</ActionButton>
+						</Actions>
+					</template>
+				</PollItemDate>
+			</ul>
+		</div>
 		<Modal v-if="modal" :can-close="false">
 			<div class="modal__content">
 				<h2>{{ t('polls', 'Clone to option sequence') }}</h2>
@@ -237,61 +239,14 @@ export default {
 
 }
 </script>
-
-<style lang="scss">
-	.modal__content {
-		padding: 14px;
+<style lang="scss" scoped>
+	.selectUnit {
 		display: flex;
-		flex-direction: column;
-		color: var(--color-main-text);
 		input {
-			width: 100%;
-		}
-	}
-
-	.modal__buttons {
-		display: flex;
-		justify-content: end;
-		.button {
-			margin-left: 10px;
-			margin-right: 0;
-		}
-	}
-
-	.config-box {
-		display: flex;
-		flex-direction: column;
-		padding: 8px;
-		& > * {
-			padding-left: 21px;
-		}
-
-		& > input {
-			margin-left: 24px;
-			width: auto;
-
-		}
-
-		& > textarea {
-			margin-left: 24px;
-			width: auto;
-			padding: 7px 6px;
-		}
-
-		& > .title {
-			display: flex;
-			background-position: 0 2px;
-			padding-left: 24px;
-			opacity: 0.7;
-			font-weight: bold;
-			margin-bottom: 4px;
-			& > span {
-				padding-left: 4px;
-			}
+			width: 90px;
 		}
-		&.poll-table > li {
-			border-bottom-color: rgb(72, 72, 72);
-			margin-left: 18px;
+		.multiselect {
+			margin-top: 3px;
 		}
 	}
 </style>
diff --git a/src/js/components/SideBar/SideBarTabOptionsText.vue b/src/js/components/SideBar/SideBarTabOptionsText.vue
index edf61e3f1..6c8823723 100644
--- a/src/js/components/SideBar/SideBarTabOptionsText.vue
+++ b/src/js/components/SideBar/SideBarTabOptionsText.vue
@@ -23,7 +23,7 @@
 <template>
 	<div>
 		<div class="config-box">
-			<label class="title icon-toggle-filelist">
+			<label class="title icon-add">
 				{{ t('polls', 'Add a new text option') }}
 			</label>
 
@@ -32,7 +32,7 @@
 		</div>
 
 		<ul class="config-box poll-table">
-			<label class="title icon-calendar">
+			<label class="title icon-toggle-filelist">
 				{{ t('polls', 'Available Options') }}
 			</label>
 			<draggable v-model="sortOptions">
@@ -125,23 +125,17 @@ export default {
 }
 </script>
 
-<style lang="scss">
-
-	.draggable {
-		* {
-			cursor: move;
-			cursor: grab;
-			&:active {
-				cursor: grabbing;
-				cursor: -moz-grabbing;
-				cursor: -webkit-grabbing;
-			}
+<style lang="scss" scoped>
+	.draggable, .draggable .pollOption  {
+		cursor: grab;
+		&:active {
+			cursor: grabbing;
+			cursor: -moz-grabbing;
+			cursor: -webkit-grabbing;
 		}
-
 		.handle {
 			visibility: hidden;
 		}
-
 		&:hover > .handle {
 			visibility: visible;
 		}
@@ -149,7 +143,6 @@ export default {
 	}
 
 	.config-box {
-
 		&.poll-table .poll-item {
 			border-bottom: 1px solid var(--color-border);
 		}
@@ -175,8 +168,4 @@ export default {
 		cursor: pointer;
 	}
 
-	.poll-table {
-		&.poll-item {
-		}
-	}
 </style>
diff --git a/src/js/components/SideBar/SideBarTabShare.vue b/src/js/components/SideBar/SideBarTabShare.vue
index 002497204..63ef3017e 100644
--- a/src/js/components/SideBar/SideBarTabShare.vue
+++ b/src/js/components/SideBar/SideBarTabShare.vue
@@ -40,6 +40,8 @@
 					<ActionButton icon="icon-clippy" @click="copyLink( { url: OC.generateUrl('apps/polls/s/') + share.token })">
 						{{ t('polls', 'Copy link to clipboard') }}
 					</ActionButton>
+				</Actions>
+				<Actions>
 					<ActionButton icon="icon-delete" @click="removeShare(share)">
 						{{ t('polls', 'Remove share') }}
 					</ActionButton>
@@ -84,14 +86,12 @@
 					<ActionButton icon="icon-clippy" @click="copyLink( { url: OC.generateUrl('apps/polls/s/') + share.token })">
 						{{ t('polls', 'Copy link to clipboard') }}
 					</ActionButton>
+				</Actions>
+				<Actions>
 					<ActionButton icon="icon-delete" @click="removeShare(share)">
 						{{ t('polls', 'Remove share') }}
 					</ActionButton>
 				</Actions>
-				<!-- <div class="options">
-					<a class="icon icon-clippy" @click="copyLink( { url: OC.generateUrl('apps/polls/s/') + share.token } )" />
-					<a class="icon icon-delete" @click="removeShare(share)" />
-				</div> -->
 			</li>
 		</TransitionGroup>
 		<div class="user-row user" @click="addShare({type: 'public', user: '', emailAddress: ''})">
@@ -244,19 +244,6 @@ export default {
 		}
 	}
 
-	.options {
-		display: flex;
-
-		.icon:not(.hidden) {
-			padding: 14px;
-			height: 44px;
-			width: 44px;
-			opacity: .5;
-			display: block;
-			cursor: pointer;
-		}
-	}
-
 	.multiselect {
 		width: 100% !important;
 		max-width: 100% !important;
diff --git a/src/js/components/VoteTable/VoteList.vue b/src/js/components/VoteTable/VoteList.vue
index 7fe8e4d82..d436b12e5 100644
--- a/src/js/components/VoteTable/VoteList.vue
+++ b/src/js/components/VoteTable/VoteList.vue
@@ -156,7 +156,7 @@ export default {
 	}
 
 	.vote-list {
-		margin: 44px 0;
+		// margin: 44px 0;
 		display: flex;
 		flex: 0;
 		flex-direction: column;
diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue
index c2ecb7551..11f253392 100644
--- a/src/js/components/VoteTable/VoteTable.vue
+++ b/src/js/components/VoteTable/VoteTable.vue
@@ -21,7 +21,7 @@
   -->
 
 <template lang="html">
-	<div class="vote-table">
+	<div class="vote-table" :class="{ 'owner-access': acl.allowEdit }">
 		<div class="vote-table__header">
 			<div class="vote-table__user-column" />
 
@@ -146,6 +146,14 @@ export default {
 		background-color: var(--color-main-background);
 		width: 230px;
 		flex: 0 0 auto;
+		.owner-access {
+			width: 280px;
+		}
+	}
+
+	.owner-access .user-row.vote-table__user-column,
+	.owner-access .vote-table__header > .vote-table__user-column {
+			width: 280px;
 	}
 
 	.modal__content {
@@ -176,12 +184,13 @@ export default {
 	}
 
 	.vote-table {
-		margin: 44px 0;
+		// margin: 44px 0;
 		display: flex;
 		flex: 0;
 		flex-direction: column;
 		justify-content: flex-start;
 		overflow: scroll;
+		padding-bottom: 10px;
 
 		& > div {
 			display: flex;
diff --git a/src/js/components/VoteTable/VoteTableHeader.vue b/src/js/components/VoteTable/VoteTableHeader.vue
index 45f181bb6..8b6504c44 100644
--- a/src/js/components/VoteTable/VoteTableHeader.vue
+++ b/src/js/components/VoteTable/VoteTableHeader.vue
@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<div class="vote-header" :class=" { winner: isWinner }">
+	<div class="vote-table-header" :class=" { winner: isWinner }">
 		<div v-if="poll.type === 'textPoll'" class="text-box">
 			{{ option.pollOptionText }}
 		</div>
@@ -126,7 +126,7 @@ export default {
 
 <style lang="scss" scoped>
 
-.vote-header {
+.vote-table-header {
 	display: flex;
 	flex-direction: column;
 	&.winner {
@@ -169,7 +169,7 @@ export default {
 	flex: 1 0;
 	height: 44px;
 	align-self: center;
-	font-size: 1.4em;
+	font-size: 1.2em;
 	padding-top: 14px;
 	hyphens: auto;
 }
@@ -183,17 +183,17 @@ export default {
 	justify-content: center;
 
 	.month, .dow {
-		font-size: 1.2em;
+		font-size: 1.1em;
 		color: var(--color-text-lighter);
 	}
 	.day {
-		font-size: 1.8em;
+		font-size: 1.4em;
 		margin: 5px 0 5px 0;
 	}
 }
 
 @media (max-width: (480px) ) {
-	.vote-header {
+	.vote-table-header {
 		padding: 4px 0;
 		display: flex;
 		flex-direction: row;
diff --git a/src/js/components/VoteTable/VoteTableItem.vue b/src/js/components/VoteTable/VoteTableItem.vue
index b9aaf7867..b3d8292dc 100644
--- a/src/js/components/VoteTable/VoteTableItem.vue
+++ b/src/js/components/VoteTable/VoteTableItem.vue
@@ -106,10 +106,10 @@ export default {
 			background-position: center;
 			background-repeat: no-repeat;
 			// background-image: var(--icon-close-000);
-			min-width: 40px;
-			min-height: 40px;
-			width: 40px;
-			height: 40px;
+			min-width: 30px;
+			min-height: 30px;
+			width: 30px;
+			height: 30px;
 			background-size: 90%;
 			flex: 0 0 auto;
 		}
diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue
index caaf9aa2f..3676459a0 100644
--- a/src/js/views/Vote.vue
+++ b/src/js/views/Vote.vue
@@ -200,10 +200,8 @@ export default {
 }
 
 .header-actions {
-	right: 0;
-	top: 0;
-	position: absolute;
 	display: flex;
+	float: right;
 }
 
 .icon.icon-settings.active {
@@ -212,9 +210,8 @@ export default {
 	height: 44px;
 }
 @media (max-width: (1024px)) {
-	.poll-title {
+	.title {
 		padding-left: 14px;
-		padding-right: 90px;
 	}
 }
 </style>