diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue
index b4f9e9aa2..cbac93ce7 100644
--- a/src/components/navigation/AppNavigation.vue
+++ b/src/components/navigation/AppNavigation.vue
@@ -21,61 +21,45 @@
   -->
 
 <template>
-	<div id="app-navigation" :class="{'icon-loading': loading}">
-		<AppNavigationVue>
-			<ul>
-				<AppNavigationBoardCategory
-					id="deck-navigation-all"
-					to="/board"
-					:text="t('deck', 'All boards')"
-					:boards="noneArchivedBoards"
-					:open-on-add-boards="true"
-					icon="icon-deck" />
-				<AppNavigationBoardCategory
-					id="deck-navigation-archived"
-					to="/board/archived"
-					:text="t('deck', 'Archived boards')"
-					:boards="archivedBoards"
-					icon="icon-archive" />
-				<AppNavigationBoardCategory
-					id="deck-navigation-shared"
-					to="/board/shared"
-					:text="t('deck', 'Shared with you')"
-					:boards="sharedBoards"
-					icon="icon-shared" />
-				<AppNavigationAddBoard v-if="canCreate" />
-			</ul>
-			<AppNavigationSettings>
-				<div>
-					<Multiselect v-model="groupLimit"
-						:class="{'icon-loading-small': groupLimitDisabled}"
-						open-direction="bottom"
-						:options="groups"
-						:multiple="true"
-						:disabled="groupLimitDisabled"
-						:placeholder="t('deck', 'Limit deck usage of groups')"
-						label="displayname"
-						track-by="id"
-						@input="updateConfig" />
-					<p>{{ t('deck', 'Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them.') }}</p>
-				</div>
-			</AppNavigationSettings>
-		</AppNavigationVue>
-
-		<ul id="deck-navigation">
+	<AppNavigationVue :class="{'icon-loading': loading}">
+		<ul>
+			<AppNavigationBoardCategory
+				id="deck-navigation-all"
+				to="/board"
+				:text="t('deck', 'All boards')"
+				:boards="noneArchivedBoards"
+				:open-on-add-boards="true"
+				icon="icon-deck" />
+			<AppNavigationBoardCategory
+				id="deck-navigation-archived"
+				to="/board/archived"
+				:text="t('deck', 'Archived boards')"
+				:boards="archivedBoards"
+				icon="icon-archive" />
+			<AppNavigationBoardCategory
+				id="deck-navigation-shared"
+				to="/board/shared"
+				:text="t('deck', 'Shared with you')"
+				:boards="sharedBoards"
+				icon="icon-shared" />
 			<AppNavigationAddBoard v-if="canCreate" />
 		</ul>
-		<div v-if="isAdmin"
-			id="app-settings"
-			v-click-outside="closeMenu"
-			:class="{open: opened}">
-			<div id="app-settings-header">
-				<button class="settings-button" @click="toggleMenu">
-					{{ t('deck', 'Settings') }}
-				</button>
+		<AppNavigationSettings>
+			<div>
+				<Multiselect v-model="groupLimit"
+					:class="{'icon-loading-small': groupLimitDisabled}"
+					open-direction="bottom"
+					:options="groups"
+					:multiple="true"
+					:disabled="groupLimitDisabled"
+					:placeholder="t('deck', 'Limit deck usage of groups')"
+					label="displayname"
+					track-by="id"
+					@input="updateConfig" />
+				<p>{{ t('deck', 'Limiting Deck will block users not part of those groups from creating their own boards. Users will still be able to work on boards that have been shared with them.') }}</p>
 			</div>
-		</div>
-	</div>
+		</AppNavigationSettings>
+	</AppNavigationVue>
 </template>
 
 <script>
@@ -151,12 +135,6 @@ export default {
 		}
 	},
 	methods: {
-		toggleMenu() {
-			this.opened = !this.opened
-		},
-		closeMenu() {
-			this.opened = false
-		},
 		updateConfig() {
 			this.groupLimitDisabled = true
 			axios.post(generateUrl('apps/deck/config/groupLimit'), {