diff --git a/src/modules/modals/CreateContext.vue b/src/modules/modals/CreateContext.vue
index 05b17e396..b5810ce85 100644
--- a/src/modules/modals/CreateContext.vue
+++ b/src/modules/modals/CreateContext.vue
@@ -104,7 +104,7 @@ export default {
 			} else {
 				const newContextId = await this.sendNewContextToBE()
 				if (newContextId) {
-					await this.$router.push('/context/' + newContextId)
+					await this.$router.push('/application/' + newContextId)
 					this.actionCancel()
 				}
 			}
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 82cdcc2d4..932524599 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -50,7 +50,7 @@
 import { NcModal, NcEmojiPicker, NcButton } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import '@nextcloud/dialogs/dist/index.css'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
 import { NODE_TYPE_TABLE, NODE_TYPE_VIEW } from '../../shared/constants.js'
 
@@ -83,6 +83,7 @@ export default {
 	},
 	computed: {
 		...mapGetters(['getContext']),
+		...mapState(['tables', 'views']),
 		localContext() {
 			return this.getContext(this.contextId)
 		},
@@ -146,10 +147,10 @@ export default {
 		},
 		getContextResources(context) {
 			const resources = []
-			const nodes = Object.values(context)
+			const nodes = Object.values(context.nodes)
 			for (const node of nodes) {
 				if (parseInt(node.node_type) === NODE_TYPE_TABLE || parseInt(node.node_type) === NODE_TYPE_VIEW) {
-					const element = parseInt(node.node_type) === NODE_TYPE_TABLE ? this.tables.find(t => t.id === node.id) : this.views.find(v => v.id === node.id)
+					const element = parseInt(node.node_type) === NODE_TYPE_TABLE ? this.tables.find(t => t.id === node.node_id) : this.views.find(v => v.id === node.node_id)
 					if (element) {
 						const elementKey = parseInt(node.node_type) === NODE_TYPE_TABLE ? 'table-' : 'view-'
 						const resource = {
diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index 4db984624..c304119cf 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -23,7 +23,7 @@
 <script>
 import { NcAppNavigationItem, NcActionButton } from '@nextcloud/vue'
 import '@nextcloud/dialogs/dist/index.css'
-import { mapGetters, mapState } from 'vuex'
+import { mapGetters } from 'vuex'
 import Table from 'vue-material-design-icons/Table.vue'
 import { emit } from '@nextcloud/event-bus'
 import PlaylistEdit from 'vue-material-design-icons/PlaylistEdit.vue'
@@ -51,7 +51,6 @@ export default {
 
 	computed: {
 		...mapGetters(['activeContext']),
-		...mapState(['tables', 'views']),
 	},
 	methods: {
 		emit,
diff --git a/src/pages/Context.vue b/src/pages/Context.vue
index 56a392334..0b4ccd697 100644
--- a/src/pages/Context.vue
+++ b/src/pages/Context.vue
@@ -4,10 +4,10 @@
 		<div v-if="!loading && context">
 			<div class="content first-row">
 				<div class="row">
-					<h1> {{ context.iconName }}&nbsp; {{ context.name }}</h1>
+					<h1> {{ activeContext.iconName }}&nbsp; {{ activeContext.name }}</h1>
 				</div>
 				<div class="row">
-					<h3> {{ context.description }}</h3>
+					<h3> {{ activeContext.description }}</h3>
 				</div>
 			</div>
 
@@ -126,7 +126,7 @@ export default {
 		},
 		async loadContext() {
 			this.contextResources = []
-			await this.$store.dispatch('getContext', { id: this.activeContextId })
+			await this.$store.dispatch('loadContext', { id: this.activeContextId })
 			const index = this.contexts.findIndex(c => parseInt(c.id) === parseInt(this.activeContextId))
 			this.context = this.contexts[index]
 
diff --git a/src/shared/components/ncContextResource/ResourceList.vue b/src/shared/components/ncContextResource/ResourceList.vue
index 1f247b4f1..b89cc39df 100644
--- a/src/shared/components/ncContextResource/ResourceList.vue
+++ b/src/shared/components/ncContextResource/ResourceList.vue
@@ -8,9 +8,7 @@
 			<div v-for="resource in getResources" :key="resource.key" class="row">
 				<div class="fix-col-2">
 					<div style="display:flex; align-items: center;">
-						{{ resource.emoji }}
-					</div>
-					<div> {{ resource.title }} </div>
+						{{ resource.emoji }} &nbsp; {{ resource.title }} </div>
 				</div>
 				<div class="fix-col-2" style="justify-content: end;">
 					<NcActionButton :close-after-click="true" icon="icon-delete" @click="actionDelete(resource)">
diff --git a/src/store/store.js b/src/store/store.js
index 2fcb7d9b7..15d606b1a 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -385,7 +385,7 @@ export default new Vuex.Store({
 			return true
 		},
 
-		async getContext({ state, commit, dispatch }, { id }) {
+		async loadContext({ state, commit, dispatch }, { id }) {
 			try {
 				const res = await axios.get(generateOcsUrl('/apps/tables/api/2/contexts/' + id))
 				commit('setContext', res.data.ocs.data)