diff --git a/src/modules/navigation/partials/NavigationContextItem.vue b/src/modules/navigation/partials/NavigationContextItem.vue
index c304119cf..248160bf8 100644
--- a/src/modules/navigation/partials/NavigationContextItem.vue
+++ b/src/modules/navigation/partials/NavigationContextItem.vue
@@ -7,7 +7,7 @@
 				{{ context.iconName }}
 			</template>
 			<template v-else>
-				<Table :size="20" />
+				<TableIcon :size="20" />
 			</template>
 		</template>
 		<template #actions>
@@ -24,7 +24,7 @@
 import { NcAppNavigationItem, NcActionButton } from '@nextcloud/vue'
 import '@nextcloud/dialogs/dist/index.css'
 import { mapGetters } from 'vuex'
-import Table from 'vue-material-design-icons/Table.vue'
+import TableIcon from 'vue-material-design-icons/Table.vue'
 import { emit } from '@nextcloud/event-bus'
 import PlaylistEdit from 'vue-material-design-icons/PlaylistEdit.vue'
 import permissionsMixin from '../../../shared/components/ncTable/mixins/permissionsMixin.js'
@@ -34,8 +34,7 @@ export default {
 
 	components: {
 		PlaylistEdit,
-		// eslint-disable-next-line vue/no-reserved-component-names
-		Table,
+		TableIcon,
 		NcAppNavigationItem,
 		NcActionButton,
 	},
diff --git a/src/pages/Context.vue b/src/pages/Context.vue
index 0b4ccd697..023ec094f 100644
--- a/src/pages/Context.vue
+++ b/src/pages/Context.vue
@@ -13,12 +13,12 @@
 
 			<div class="resources">
 				<div v-for="resource in contextResources" :key="resource.key">
-					<div v-if="!resource.isView">
+					<div v-if="!resource.isView" class="resource">
 						<TableWrapper :table="resource" :columns="columns[resource.key]" :rows="rows[resource.key]"
 							:view-setting="viewSetting" @create-column="createColumn(false, resource)"
 							@import="openImportModal(resource, false)" @download-csv="downloadCSV(resource, false)" />
 					</div>
-					<div v-else-if="resource.isView">
+					<div v-else-if="resource.isView" class="resource">
 						<CustomView :view="resource" :columns="columns[resource.key]" :rows="rows[resource.key]"
 							:view-setting="viewSetting" @create-column="createColumn(true, resource)"
 							@import="openImportModal(resource, true)" @download-csv="downloadCSV(resource, true)" />
@@ -181,9 +181,9 @@ export default {
 
 <style scoped lang="scss">
 .content {
-	margin: 50px;
+	margin: 50px 50px 0;
 }
-.resource, content {
-	padding: 30px 0;
+.resource {
+	margin: 40px 0;
 }
 </style>
diff --git a/src/shared/components/ncContextResource/ResourceForm.vue b/src/shared/components/ncContextResource/ResourceForm.vue
index e5f93214c..ac5e0bc05 100644
--- a/src/shared/components/ncContextResource/ResourceForm.vue
+++ b/src/shared/components/ncContextResource/ResourceForm.vue
@@ -6,7 +6,7 @@
 		<NcSelect style="width: 100%;" :loading="loading" :options="options" :clear-on-select="true"
 			:hide-selected="true" :placeholder="t('tables', 'Select a table or view')" :searchable="true"
 			:get-option-key="(option) => option.key" label="title"
-			:aria-label-combobox="t('tables', 'Select a table or view')" :user-select="true" :preselect-first="true"
+			:aria-label-combobox="t('tables', 'Select a table or view')" :preselect-first="true"
 			:preserve-search="true" @search="asyncFind" @input="addResource">
 			<template #no-options>
 				{{ t('tables', 'No recommendations. Start typing.') }}
diff --git a/src/store/store.js b/src/store/store.js
index 15d606b1a..0095000dc 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -128,7 +128,7 @@ export default new Vuex.Store({
 			try {
 				res = await axios.post(generateOcsUrl('/apps/tables/api/2/contexts'), data)
 			} catch (e) {
-				displayError(e, t('tables', 'Could not insert context.'))
+				displayError(e, t('tables', 'Could not insert application.'))
 				return false
 			}
 			const contexts = state.contexts
@@ -345,7 +345,7 @@ export default new Vuex.Store({
 			try {
 				res = await axios.put(generateOcsUrl('/apps/tables/api/2/contexts/' + id), data)
 			} catch (e) {
-				displayError(e, t('tables', 'Could not update context.'))
+				displayError(e, t('tables', 'Could not update application.'))
 				return false
 			}
 
@@ -378,8 +378,8 @@ export default new Vuex.Store({
 				const res = await axios.get(generateOcsUrl('/apps/tables/api/2/contexts'))
 				commit('setContexts', res.data.ocs.data)
 			} catch (e) {
-				displayError(e, t('tables', 'Could not load contexts.'))
-				showError(t('tables', 'Could not fetch contexts'))
+				displayError(e, t('tables', 'Could not load applications.'))
+				showError(t('tables', 'Could not fetch applications'))
 			}
 			commit('setContextsLoading', false)
 			return true
@@ -390,8 +390,8 @@ export default new Vuex.Store({
 				const res = await axios.get(generateOcsUrl('/apps/tables/api/2/contexts/' + id))
 				commit('setContext', res.data.ocs.data)
 			} catch (e) {
-				displayError(e, t('tables', 'Could not load context.'))
-				showError(t('tables', 'Could not fetch context'))
+				displayError(e, t('tables', 'Could not load application.'))
+				showError(t('tables', 'Could not fetch application'))
 			}
 			return true
 		},