diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 9b80871b2..a9722053f 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -48,7 +48,8 @@
 				</form>
 			</div>
 			<div class="board-action-buttons">
-				<button title="Show archived cards" class="icon icon-archive" @click="toggleShowArchived" />
+				<button :style="archivStyle" title="Show archived cards" class="icon icon-archive"
+					@click="toggleShowArchived" />
 				<button :class="[(compactMode ? 'icon-toggle-compact-collapsed' : 'icon-toggle-compact-expanded')]" title="Toggle compact mode" class="icon"
 					@click="toggleCompactMode" />
 				<router-link v-tooltip="t('deck', 'Board settings')" :to="{name: 'board.details'}" class="icon-settings-dark"
@@ -73,13 +74,21 @@ export default {
 	data() {
 		return {
 			newStackTitle: '',
-			stack: ''
+			stack: '',
+			showArchived: false
 		}
 	},
 	computed: {
 		...mapState({
 			compactMode: state => state.compactMode
-		})
+		}),
+		archivStyle() {
+
+			if (this.showArchived === true) {
+				return 'opacity: 1.0'
+			}
+			return 'opacity: 0.3'
+		}
 	},
 	methods: {
 		toggleNav() {
@@ -93,6 +102,7 @@ export default {
 		},
 		toggleShowArchived() {
 			this.$store.dispatch('toggleShowArchived')
+			this.showArchived = !this.showArchived
 		},
 		clickAddNewStack() {
 			this.stack = { title: this.newStackTitle }
diff --git a/src/components/board/Stack.vue b/src/components/board/Stack.vue
index 8a3f5eb6e..1dadd511c 100644
--- a/src/components/board/Stack.vue
+++ b/src/components/board/Stack.vue
@@ -23,7 +23,6 @@
 
 <template>
 	<div>
-		order: {{ stack.order }}
 		<h3 v-if="!editing" @click="startEditing(stack)">{{ stack.title }}
 			<button v-tooltip="t('deck', 'Delete')" class="icon-delete"
 				@click="deleteStack(stack)" />
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 895b006d1..6c13dc1a4 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -38,8 +38,6 @@
 			</multiselect>
 
 			<p>Assign to user</p>
-			assignd:
-			{{ copiedCard.assignedUsers }}
 			<multiselect v-model="assignedUsers" :multiple="true" :options="assignableUsers"
 				label="displayname"
 				track-by="primaryKey"
@@ -67,6 +65,9 @@
 		</AppSidebarTab>
 		<AppSidebarTab name="Attachments" icon="icon-files-dark">
 			{{ currentCard.attachments }}
+			<button class="icon-upload" @click="clickAddNewAttachmment()">
+				{{ t('deck', 'Upload attachment') }}
+			</button>
 		</AppSidebarTab>
 		<AppSidebarTab name="Timeline" icon="icon-activity">
 			this is the activity tab
@@ -190,7 +191,11 @@ export default {
 				labelId: removedLabel.id
 			}
 			this.$store.dispatch('removeLabel', data)
+		},
+		clickAddNewAttachmment() {
+
 		}
+
 	}
 }
 </script>
diff --git a/src/components/cards/CardBadges.vue b/src/components/cards/CardBadges.vue
index 4f2cedbe7..d011bb16f 100644
--- a/src/components/cards/CardBadges.vue
+++ b/src/components/cards/CardBadges.vue
@@ -33,7 +33,7 @@
 			<span>0/0</span>
 		</div>
 		<div v-if="card.assignedUsers" class="card-assigned-users">
-			<avatar v-for="user in card.assignedUsers" :key="user.id" user="user.participant.primaryKey" />
+			<avatar v-for="user in card.assignedUsers" :key="user.id" :user="user.participant.primaryKey" />
 		</div>
 	</div>
 </template>
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index 7f581cfca..6d8596573 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -30,7 +30,14 @@
 					<input v-model="copiedCard.title" type="text" autofocus>
 					<input type="button" class="icon-confirm" @click="finishedEdit(card)">
 				</form>
-				<action v-if="!editing" :actions="visibilityPopover" @click.stop="" />
+
+				<Actions>
+					<ActionButton icon="icon-archive-dark" @click="assignCardToMe()">{{ t('deck', 'Assign to me') }}</ActionButton>
+					<ActionButton icon="icon-archive" @click="archiveUnarchiveCard()">{{ t('deck', (showArchived ? 'Unarchive card' : 'Archive card')) }}</ActionButton>
+					<ActionButton icon="icon-delete" @click="deleteCard()">{{ t('deck', 'Delete card') }}</ActionButton>
+					<ActionButton icon="icon-settings-dark" @click="setCurrentCard()">{{ t('deck', 'Card details') }}</ActionButton>
+				</Actions>
+
 			</transition>
 		</div>
 		<ul class="labels">
@@ -43,7 +50,9 @@
 </template>
 
 <script>
-import { PopoverMenu, Action } from 'nextcloud-vue'
+import { PopoverMenu } from 'nextcloud-vue'
+import { Actions } from 'nextcloud-vue/dist/Components/Actions'
+import { ActionButton } from 'nextcloud-vue/dist/Components/ActionButton'
 import ClickOutside from 'vue-click-outside'
 import { mapState } from 'vuex'
 
@@ -53,7 +62,7 @@ import Color from '../../mixins/color'
 
 export default {
 	name: 'CardItem',
-	components: { PopoverMenu, CardBadges, LabelTag, Action },
+	components: { PopoverMenu, CardBadges, LabelTag, Actions, ActionButton },
 	directives: {
 		ClickOutside
 	},
@@ -89,38 +98,6 @@ export default {
 					color: this.textColor(label.color)
 				}
 			}
-		},
-		visibilityPopover() {
-			return [
-				{
-					action: () => {
-						this.assignCardToMe()
-					},
-					icon: 'icon-archive-dark',
-					text: t('deck', 'Assign to me')
-				},
-				{
-					action: () => {
-						this.archiveUnarchiveCard()
-					},
-					icon: 'icon-archive',
-					text: t('deck', (this.showArchived ? 'Unarchive card' : 'Archive card'))
-				},
-				{
-					action: () => {
-						this.deleteCard()
-					},
-					icon: 'icon-delete',
-					text: t('deck', 'Delete card')
-				},
-				{
-					action: () => {
-						this.setCurrentCard()
-					},
-					icon: 'icon-settings-dark',
-					text: t('deck', 'Card details')
-				}
-			]
 		}
 	},
 	methods: {
diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue
index 7f81125c0..b76a9463b 100644
--- a/src/components/navigation/AppNavigation.vue
+++ b/src/components/navigation/AppNavigation.vue
@@ -102,7 +102,8 @@ export default {
 		]),
 		isAdmin() {
 			// eslint-disable-next-line
-			return oc_isadmin
+			//return oc_isadmin
+			return OC.isUserAdmin()
 		}
 	},
 	beforeMount() {
diff --git a/src/components/navigation/AppNavigationAddBoard.vue b/src/components/navigation/AppNavigationAddBoard.vue
index 93a39aeab..460bf374b 100644
--- a/src/components/navigation/AppNavigationAddBoard.vue
+++ b/src/components/navigation/AppNavigationAddBoard.vue
@@ -63,7 +63,6 @@ export default {
 			this.editing = true
 		},
 		createBoard(e) {
-			console.log(this.color)
 			const title = e.currentTarget.childNodes[0].value
 			this.$store.dispatch('createBoard', {
 				title: title,
diff --git a/src/components/navigation/AppNavigationBoard.vue b/src/components/navigation/AppNavigationBoard.vue
index da82e5566..20b385ae9 100644
--- a/src/components/navigation/AppNavigationBoard.vue
+++ b/src/components/navigation/AppNavigationBoard.vue
@@ -27,6 +27,18 @@
 		<a href="#">
 			{{ board.title }}
 		</a>
+
+		<span v-if="actions.length > 0">
+
+			<template v-if="board.acl.length === 0">
+				<button class="icon-shared" style="opacity: 0.3" @click="showSidebar" />
+			</template>
+
+			<template v-else>
+				<button class="icon-shared" @click="showSidebar" />
+			</template>
+
+		</span>
 		<div v-if="actions.length > 0" class="app-navigation-entry-utils">
 			<ul>
 				<li class="app-navigation-entry-utils-menu-button">
@@ -212,6 +224,11 @@ export default {
 		},
 		cancelEdit(e) {
 			this.editing = false
+		},
+		showSidebar() {
+			const route = this.routeTo
+			route.name = 'board.details'
+			this.$router.push(route)
 		}
 	},
 	inject: [