diff --git a/src/Forms.vue b/src/Forms.vue
index 88192313f..b8eedcce6 100644
--- a/src/Forms.vue
+++ b/src/Forms.vue
@@ -33,7 +33,7 @@
 			</NcAppNavigationNew>
 			<template #list>
 				<!-- Form-Owner-->
-				<NcAppNavigationCaption v-if="!noOwnedForms" :title="t('forms', 'Your Forms')" />
+				<NcAppNavigationCaption v-if="!noOwnedForms" :name="t('forms', 'Your Forms')" />
 				<AppNavigationForm v-for="form in forms"
 					:key="form.id"
 					:form="form"
@@ -44,7 +44,7 @@
 					@delete="onDeleteForm" />
 
 				<!-- Shared Forms-->
-				<NcAppNavigationCaption v-if="!noSharedForms" :title="t('forms', 'Shared with you')" />
+				<NcAppNavigationCaption v-if="!noSharedForms" :name="t('forms', 'Shared with you')" />
 				<AppNavigationForm v-for="form in sharedForms"
 					:key="form.id"
 					:form="form"
@@ -57,14 +57,16 @@
 		<!-- No forms & loading emptycontents -->
 		<NcAppContent v-if="loading || !hasForms || !routeHash || !routeAllowed">
 			<NcEmptyContent v-if="loading"
-				:title="t('forms', 'Loading forms …')">
+				class="forms-emptycontent"
+				:name="t('forms', 'Loading forms …')">
 				<template #icon>
 					<NcLoadingIcon :size="64" />
 				</template>
 			</NcEmptyContent>
 
 			<NcEmptyContent v-else-if="!hasForms"
-				:title="t('forms', 'No forms created yet')">
+				class="forms-emptycontent"
+				:name="t('forms', 'No forms created yet')">
 				<template #icon>
 					<FormsIcon :size="64" />
 				</template>
@@ -76,7 +78,8 @@
 			</NcEmptyContent>
 
 			<NcEmptyContent v-else
-				:title="canCreateForms ? t('forms', 'Select a form or create a new one') : t('forms', 'Please select a form')">
+				class="forms-emptycontent"
+				:name="canCreateForms ? t('forms', 'Select a form or create a new one') : t('forms', 'Please select a form')">
 				<template #icon>
 					<FormsIcon :size="64" />
 				</template>
@@ -378,3 +381,9 @@ export default {
 	},
 }
 </script>
+
+<style scoped lang="scss">
+.forms-emptycontent {
+	height: 100%;
+}
+</style>
diff --git a/src/FormsEmptyContent.vue b/src/FormsEmptyContent.vue
index 4ec7f26d8..4f4781d6d 100644
--- a/src/FormsEmptyContent.vue
+++ b/src/FormsEmptyContent.vue
@@ -22,7 +22,7 @@
 
 <template>
 	<NcContent app-name="forms" class="forms-emptycontent">
-		<NcEmptyContent :title="currentModel.title"
+		<NcEmptyContent :name="currentModel.title"
 			:description="currentModel.description">
 			<template #icon>
 				<Icon :is="currentModel.icon" :size="64" />
@@ -82,5 +82,7 @@ export default {
 .forms-emptycontent {
 	flex-basis: 100vw;
 	flex-direction: column;
+	height: 100%;
+	display: flex;
 }
 </style>
diff --git a/src/FormsSettings.vue b/src/FormsSettings.vue
index 0bc18ef14..5f1a10fd2 100644
--- a/src/FormsSettings.vue
+++ b/src/FormsSettings.vue
@@ -22,7 +22,7 @@
 
 <template>
 	<div>
-		<NcSettingsSection :title="t('forms', 'Form creation')">
+		<NcSettingsSection :name="t('forms', 'Form creation')">
 			<NcCheckboxRadioSwitch ref="switchRestrictCreation"
 				:checked.sync="appConfig.restrictCreation"
 				class="forms-settings__creation__switch"
@@ -39,7 +39,7 @@
 				label="displayName"
 				@input="onCreationAllowedGroupsChange" />
 		</NcSettingsSection>
-		<NcSettingsSection :title="t('forms', 'Form sharing')">
+		<NcSettingsSection :name="t('forms', 'Form sharing')">
 			<NcCheckboxRadioSwitch ref="switchAllowPublicLink"
 				:checked.sync="appConfig.allowPublicLink"
 				type="switch"
diff --git a/src/components/AppNavigationForm.vue b/src/components/AppNavigationForm.vue
index 660ea05eb..9f860990f 100644
--- a/src/components/AppNavigationForm.vue
+++ b/src/components/AppNavigationForm.vue
@@ -22,7 +22,7 @@
 
 <template>
 	<NcListItem ref="navigationItem"
-		:title="formTitle"
+		:name="formTitle"
 		:to="{
 			name: routerTarget,
 			params: { hash: form.hash }
@@ -37,7 +37,7 @@
 			<IconCheck v-else-if="isExpired" :size="16" />
 			<FormsIcon v-else :size="16" />
 		</template>
-		<template v-if="hasSubtitle" #subtitle>
+		<template v-if="hasSubtitle" #subname>
 			{{ formSubtitle }}
 		</template>
 		<template v-if="!loading && !readOnly" #actions>
diff --git a/src/components/SidebarTabs/SharingShareDiv.vue b/src/components/SidebarTabs/SharingShareDiv.vue
index a4be34038..462432c12 100644
--- a/src/components/SidebarTabs/SharingShareDiv.vue
+++ b/src/components/SidebarTabs/SharingShareDiv.vue
@@ -31,7 +31,7 @@
 			<span>{{ displayNameAppendix }}</span>
 		</div>
 		<NcActions class="share-div__actions">
-			<NcActionCaption :title="t('forms', 'Permissions')" />
+			<NcActionCaption :name="t('forms', 'Permissions')" />
 			<NcActionCheckbox :checked="canAccessResults" @update:checked="updatePermissionResults">
 				{{ t('forms', 'View responses') }}
 			</NcActionCheckbox>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 84df1a238..fb23eb512 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -198,7 +198,7 @@ export default {
 	align-items: center;
 	align-self: flex-end;
 	justify-content: flex-end;
-	padding: calc(var(--default-grid-baseline, 4px) * 2);
+	padding: var(--app-navigation-padding);
 
 	&__view-select {
 		display: flex;
diff --git a/src/views/Create.vue b/src/views/Create.vue
index 9c2b220d6..c9c158cff 100644
--- a/src/views/Create.vue
+++ b/src/views/Create.vue
@@ -24,7 +24,8 @@
 
 <template>
 	<NcAppContent v-if="isLoadingForm">
-		<NcEmptyContent :title="t('forms', 'Loading {title} …', { title: form.title })">
+		<NcEmptyContent class="emtpycontent"
+			:name="t('forms', 'Loading {title} …', { title: form.title })">
 			<template #icon>
 				<NcLoadingIcon :size="64" />
 			</template>
@@ -105,7 +106,7 @@
 			<div class="question-menu">
 				<NcActions ref="questionMenu"
 					:open.sync="questionMenuOpened"
-					:menu-title="t('forms', 'Add a question')"
+					:menu-name="t('forms', 'Add a question')"
 					:aria-label="t('forms', 'Add a question')"
 					:primary="true">
 					<template #icon>
@@ -425,6 +426,11 @@ export default {
 <style lang="scss" scoped>
 @import '../scssmixins/markdownOutput';
 
+.emptycontent {
+	display: flex;
+	height: 100%;
+}
+
 .app-content {
 	display: flex;
 	align-items: center;
diff --git a/src/views/Results.vue b/src/views/Results.vue
index bdcd06d8e..de7df5dd7 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -23,111 +23,116 @@
   -->
 
 <template>
-	<NcAppContent v-if="loadingResults">
-		<NcEmptyContent :title="t('forms', 'Loading responses …')">
-			<template #icon>
-				<NcLoadingIcon :size="64" />
-			</template>
-		</NcEmptyContent>
-	</NcAppContent>
-
-	<NcAppContent v-else>
+	<NcAppContent>
 		<TopBar :permissions="form?.permissions"
 			:sidebar-opened="sidebarOpened"
 			@update:sidebarOpened="onSidebarChange"
 			@share-form="onShareForm" />
-		<header v-if="!noSubmissions">
-			<h2 dir="auto">
-				{{ formTitle }}
-			</h2>
-			<p>{{ t('forms', '{amount} responses', { amount: form.submissions.length }) }}</p>
-
-			<!-- View switcher between Summary and Responses -->
-			<div class="response-actions">
-				<div class="response-actions__radio">
-					<input id="show-summary--true"
-						v-model="showSummary"
-						type="radio"
-						:value="true"
-						class="hidden">
-					<label for="show-summary--true"
-						class="response-actions__radio__item"
-						:class="{ 'response-actions__radio__item--active': showSummary }">
-						{{ t('forms', 'Summary') }}
-					</label>
-					<input id="show-summary--false"
-						v-model="showSummary"
-						type="radio"
-						:value="false"
-						class="hidden">
-					<label for="show-summary--false"
-						class="response-actions__radio__item"
-						:class="{ 'response-actions__radio__item--active': !showSummary }">
-						{{ t('forms', 'Responses') }}
-					</label>
-				</div>
 
-				<!-- Action menu for CSV export and deletion -->
-				<NcActions class="results-menu"
-					:aria-label="t('forms', 'Options')"
-					:force-menu="true">
-					<NcActionButton :close-after-click="true" @click="onStoreToFiles">
-						<template #icon>
-							<IconFolder :size="20" />
-						</template>
-						{{ t('forms', 'Save CSV to Files') }}
-					</NcActionButton>
-					<NcActionButton @click="onDownloadCsv">
-						<template #icon>
-							<IconDownload :size="20" />
-						</template>
-						{{ t('forms', 'Download CSV') }}
-					</NcActionButton>
-					<NcActionButton v-if="canDeleteSubmissions" @click="deleteAllSubmissions">
-						<template #icon>
-							<IconDelete :size="20" />
-						</template>
-						{{ t('forms', 'Delete all responses') }}
-					</NcActionButton>
-				</NcActions>
-			</div>
-		</header>
+		<!-- Loading submissions -->
+		<NcEmptyContent v-if="loadingResults"
+			class="forms-emptycontent"
+			:name="t('forms', 'Loading responses …')">
+			<template #icon>
+				<NcLoadingIcon :size="64" />
+			</template>
+		</NcEmptyContent>
 
 		<!-- No submissions -->
-		<section v-if="noSubmissions">
-			<NcEmptyContent :title="t('forms', 'No responses yet')"
-				:description="t('forms', 'Results of submitted forms will show up here')">
-				<template #icon>
-					<IconPoll :size="64" />
-				</template>
-				<template #action>
-					<NcButton type="primary" @click="onShareForm">
-						<template #icon>
-							<IconShareVariant :size="20" decorative />
-						</template>
-						{{ t('forms', 'Share form') }}
-					</NcButton>
-				</template>
-			</NcEmptyContent>
-		</section>
-
-		<!-- Summary view for visualization -->
-		<section v-if="!noSubmissions && showSummary">
-			<ResultsSummary v-for="question in form.questions"
-				:key="question.id"
-				:question="question"
-				:submissions="form.submissions" />
-		</section>
-
-		<!-- Responses view for individual responses -->
-		<section v-if="!noSubmissions && !showSummary">
-			<Submission v-for="submission in form.submissions"
-				:key="submission.id"
-				:submission="submission"
-				:questions="form.questions"
-				:can-delete-submission="canDeleteSubmissions"
-				@delete="deleteSubmission(submission.id)" />
-		</section>
+		<NcEmptyContent v-else-if="noSubmissions"
+			:name="t('forms', 'No responses yet')"
+			class="forms-emptycontent"
+			:description="t('forms', 'Results of submitted forms will show up here')">
+			<template #icon>
+				<IconPoll :size="64" />
+			</template>
+			<template #action>
+				<NcButton type="primary" @click="onShareForm">
+					<template #icon>
+						<IconShareVariant :size="20" decorative />
+					</template>
+					{{ t('forms', 'Share form') }}
+				</NcButton>
+			</template>
+		</NcEmptyContent>
+
+		<!-- Showing submissions -->
+		<template v-else>
+			<header>
+				<h2 dir="auto">
+					{{ formTitle }}
+				</h2>
+				<p>{{ t('forms', '{amount} responses', { amount: form.submissions.length }) }}</p>
+
+				<!-- View switcher between Summary and Responses -->
+				<div class="response-actions">
+					<div class="response-actions__radio">
+						<input id="show-summary--true"
+							v-model="showSummary"
+							type="radio"
+							:value="true"
+							class="hidden">
+						<label for="show-summary--true"
+							class="response-actions__radio__item"
+							:class="{ 'response-actions__radio__item--active': showSummary }">
+							{{ t('forms', 'Summary') }}
+						</label>
+						<input id="show-summary--false"
+							v-model="showSummary"
+							type="radio"
+							:value="false"
+							class="hidden">
+						<label for="show-summary--false"
+							class="response-actions__radio__item"
+							:class="{ 'response-actions__radio__item--active': !showSummary }">
+							{{ t('forms', 'Responses') }}
+						</label>
+					</div>
+
+					<!-- Action menu for CSV export and deletion -->
+					<NcActions class="results-menu"
+						:aria-label="t('forms', 'Options')"
+						:force-menu="true">
+						<NcActionButton :close-after-click="true" @click="onStoreToFiles">
+							<template #icon>
+								<IconFolder :size="20" />
+							</template>
+							{{ t('forms', 'Save CSV to Files') }}
+						</NcActionButton>
+						<NcActionButton @click="onDownloadCsv">
+							<template #icon>
+								<IconDownload :size="20" />
+							</template>
+							{{ t('forms', 'Download CSV') }}
+						</NcActionButton>
+						<NcActionButton v-if="canDeleteSubmissions" @click="deleteAllSubmissions">
+							<template #icon>
+								<IconDelete :size="20" />
+							</template>
+							{{ t('forms', 'Delete all responses') }}
+						</NcActionButton>
+					</NcActions>
+				</div>
+			</header>
+
+			<!-- Summary view for visualization -->
+			<section v-if="showSummary">
+				<ResultsSummary v-for="question in form.questions"
+					:key="question.id"
+					:question="question"
+					:submissions="form.submissions" />
+			</section>
+
+			<!-- Responses view for individual responses -->
+			<section v-else>
+				<Submission v-for="submission in form.submissions"
+					:key="submission.id"
+					:submission="submission"
+					:questions="form.questions"
+					:can-delete-submission="canDeleteSubmissions"
+					@delete="deleteSubmission(submission.id)" />
+			</section>
+		</template>
 	</NcAppContent>
 </template>
 
@@ -136,14 +141,14 @@ import { generateOcsUrl } from '@nextcloud/router'
 import { getRequestToken } from '@nextcloud/auth'
 import { getFilePickerBuilder, showError, showSuccess } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
+import axios from '@nextcloud/axios'
+import moment from '@nextcloud/moment'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
-import axios from '@nextcloud/axios'
-import moment from '@nextcloud/moment'
 
 import IconDelete from 'vue-material-design-icons/Delete.vue'
 import IconDownload from 'vue-material-design-icons/Download.vue'
@@ -326,6 +331,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.forms-emptycontent {
+	height: 100%;
+}
+
 .app-content {
 	display: flex;
 	align-items: center;
diff --git a/src/views/Sidebar.vue b/src/views/Sidebar.vue
index fb487e388..da5b5ca38 100644
--- a/src/views/Sidebar.vue
+++ b/src/views/Sidebar.vue
@@ -23,7 +23,7 @@
 <template>
 	<NcAppSidebar v-show="sidebarOpened"
 		:active="active"
-		:title="t('forms', 'Form settings')"
+		:name="t('forms', 'Form settings')"
 		@close="onClose"
 		@update:active="onUpdateActive">
 		<NcAppSidebarTab id="forms-sharing"
diff --git a/src/views/Submit.vue b/src/views/Submit.vue
index 1e6707e52..ddd8e178f 100644
--- a/src/views/Submit.vue
+++ b/src/views/Submit.vue
@@ -22,7 +22,8 @@
 
 <template>
 	<NcAppContent v-if="isLoadingForm">
-		<NcEmptyContent :title="t('forms', 'Loading {title} …', { title: form.title })">
+		<NcEmptyContent class="forms-emptycontent"
+			:name="t('forms', 'Loading {title} …', { title: form.title })">
 			<template #icon>
 				<NcLoadingIcon :size="64" />
 			</template>
@@ -58,13 +59,15 @@
 		</header>
 
 		<NcEmptyContent v-if="loading"
-			:title="t('forms', 'Submitting form …')">
+			class="forms-emptycontent"
+			:name="t('forms', 'Submitting form …')">
 			<template #icon>
 				<NcLoadingIcon :size="64" />
 			</template>
 		</NcEmptyContent>
 		<NcEmptyContent v-else-if="success || !form.canSubmit"
-			:title="t('forms', 'Thank you for completing the form!')"
+			class="forms-emptycontent"
+			:name="t('forms', 'Thank you for completing the form!')"
 			:description="form.submissionMessage">
 			<template #icon>
 				<IconCheck :size="64" />
@@ -75,7 +78,8 @@
 			</template>
 		</NcEmptyContent>
 		<NcEmptyContent v-else-if="isExpired"
-			:title="t('forms', 'Form expired')"
+			class="forms-emptycontent"
+			:name="t('forms', 'Form expired')"
 			:description="t('forms', 'This form has expired and is no longer taking answers')">
 			<template #icon>
 				<IconCheck :size="64" />
@@ -455,6 +459,9 @@ export default {
 <style lang="scss" scoped>
 @import '../scssmixins/markdownOutput';
 
+.forms-emptycontent {
+	height: 100%;
+}
 .app-content {
 	display: flex;
 	align-items: center;