diff --git a/appinfo/info.xml b/appinfo/info.xml
index be8634f1..997b0587 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -3,10 +3,8 @@
       xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
     <id>health</id>
     <name>Health</name>
-    <summary>Track your health. Use the advantages of a trusted platform.</summary>
-    <description><![CDATA[The app provides different modules to track health data.
-
-Following modules are served:
+    <summary>Track your health privately.</summary>
+    <description><![CDATA[Track your health data within the following provided modules:
 - Weight
 - Feeling
 - Measurement
@@ -16,7 +14,7 @@ Following modules are served:
 - Medication
 
 Health is everything.]]></description>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <licence>agpl</licence>
     <author mail="flost-dev@mailbox.org" >Florian Steffens</author>
     <namespace>Health</namespace>
diff --git a/css/icons.scss b/css/icons.scss
deleted file mode 100644
index e2fff6a7..00000000
--- a/css/icons.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/**
- * @copyright Copyright (c) 2020 Florian Steffens <flost-dev@mailbox.org>
- *
- * @author Florian Steffens <flost-dev@mailbox.org>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-@include icon-black-white('health', 'app', 1);
diff --git a/cypress/e2e/health.cy.js b/cypress/e2e/health.cy.js
index 3ed42029..bf6e1133 100644
--- a/cypress/e2e/health.cy.js
+++ b/cypress/e2e/health.cy.js
@@ -14,6 +14,6 @@ describe('The Home Page', () => {
 	})
 
 	it('successfully loads', () => {
-		cy.get('h2').contains('Welcome to your health center').should('be.visible')
+		cy.get('h2').contains('Health').should('be.visible')
 	})
 })
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 789f478b..aa83f111 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -43,12 +43,12 @@ public function __construct($appName, IRequest $request) {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function index() {
+	public function index(): TemplateResponse {
 		// $this->cesService->transformDatasets();
 		// Util::addScript($this->appName, 'vue-chartjs.min');
 		Util::addScript($this->appName, 'health-main');
 		// Util::addScript($this->appName, 'health');
-		Util::addStyle($this->appName, 'icons');
+		//Util::addStyle($this->appName, 'icons');
 		//Util::addStyle($this->appName, 'bulma.min');
 
 		$response = new TemplateResponse($this->appName, 'main');
diff --git a/src/App.vue b/src/App.vue
index cbd71358..c9801c3f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,14 +2,11 @@
 	<NcContent :class="{'icon-loading': initialLoading}" app-name="health">
 		<PersonsNavigation />
 		<NcAppContent>
-			<div class="content-menu-topright">
+			<div class="content-menu-top-right">
 				<NcActions v-if="canManage" :title="'Details'">
-					<NcActionButton icon="icon-menu-sidebar" @click="$store.commit('showSidebar', !showSidebar)" />
+					<NcActionButton :aria-label="t('health', 'Show sidebar')" icon="icon-menu-sidebar" @click="$store.commit('showSidebar', !showSidebar)" />
 				</NcActions>
 			</div>
-			<h3 v-if="person && person.name" class="icon-user h3-icon">
-				{{ person.name }}
-			</h3>
 			<PersonsContent v-if="person && activeModule === 'person'" />
 			<WeightContent v-if="person && activeModule === 'weight' && person.enabledModuleWeight" />
 			<FeelingContent v-if="person && activeModule === 'feeling' && person.enabledModuleFeeling" />
@@ -18,138 +15,42 @@
 			<SmokingContent v-if="person && activeModule === 'smoking' && person.enabledModuleSmoking" />
 			<ActivitiesContent v-if="person && activeModule === 'activities' && person.enabledModuleActivities" />
 			<MedicationContent v-if="person && activeModule === 'medicine' && person.enabledModuleMedicine" />
+			<Startpage v-else />
 		</NcAppContent>
-		<NcAppSidebar
-			v-show="showSidebar"
-			v-if="person && !loading && canManage"
-			:title="person.name"
-			:subtitle="t('health', 'Created at {creationTime}', { creationTime: formatMyDate(person.insertTime) })"
-			@close="$store.commit('showSidebar', false)"
-		>
-			<NcAppSidebarTab
-				id="person"
-				:name="t('health', 'Person')"
-				icon="icon-user"
-				:order="0"
-			>
-				<PersonsSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				id="sharing"
-				:name="t('health', 'Share')"
-				icon="icon-share"
-				:order="0.5"
-			>
-				<SharingSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				v-if="person.enabledModuleWeight"
-				id="weight"
-				:name="t('health', 'Weight')"
-				icon="icon-quota"
-				:order="1"
-			>
-				<WeightSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				v-if="person.enabledModuleFeeling"
-				id="feeling"
-				:name="t('health', 'Feeling')"
-				icon="icon-category-monitoring"
-				:order="2"
-			>
-				<FeelingSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				v-if="person.enabledModuleMeasurement"
-				id="measurement"
-				:name="t('health', 'Measurement')"
-				icon="icon-home"
-				:order="3"
-			>
-				<MeasurementSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				v-if="person.enabledModuleSleep"
-				id="sleep"
-				:name="t('health', 'Sleep')"
-				icon="icon-download"
-				:order="4"
-			>
-				<SleepSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				v-if="person.enabledModuleSmoking"
-				id="smoking"
-				:name="t('health', 'Smoking')"
-				icon="icon-address"
-				:order="5"
-			>
-				<SmokingSidebar />
-			</NcAppSidebarTab>
-			<NcAppSidebarTab
-				v-if="person.enabledModuleActivities"
-				id="activities"
-				:name="t('health', 'Activities')"
-				icon="icon-upload"
-				:order="6"
-			>
-				<ActivitiesSidebar />
-			</NcAppSidebarTab>
-		</NcAppSidebar>
+		<Sidebar :loading="loading" />
 	</NcContent>
 </template>
 
 <script>
-import NcContent from '@nextcloud/vue/dist/Components/NcContent'
-import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
-import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar'
-import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab'
+import { NcContent, NcAppContent, NcActionButton, NcActions } from '@nextcloud/vue'
 import PersonsNavigation from './modules/persons/PersonsNavigation'
-import PersonsSidebar from './modules/persons/PersonsSidebar'
-import SharingSidebar from './modules/persons/SharingSidebar'
-import WeightSidebar from './modules/weight/WeightSidebar'
-import FeelingSidebar from './modules/feeling/FeelingSidebar'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
 import WeightContent from './modules/weight/WeightContent'
 import FeelingContent from './modules/feeling/FeelingContent'
 import { mapState, mapGetters } from 'vuex'
 import PersonsContent from './modules/persons/PersonsContent'
 import SleepContent from './modules/sleep/SleepContent'
 import MeasurementContent from './modules/measurement/MeasurementContent'
-import MeasurementSidebar from './modules/measurement/MeasurementSidebar'
-import SleepSidebar from './modules/sleep/SleepSidebar'
-import moment from '@nextcloud/moment'
-import SmokingSidebar from './modules/smoking/SmokingSidebar'
 import SmokingContent from './modules/smoking/SmokingContent'
 import ActivitiesContent from './modules/activities/ActivitiesContent'
-import ActivitiesSidebar from './modules/activities/ActivitiesSidebar'
 import MedicationContent from './modules/medication/MedicationContent'
+import Sidebar from './Sidebar.vue'
+import Startpage from './Startpage.vue'
 
 export default {
 	name: 'App',
 	components: {
-		ActivitiesSidebar,
+		Startpage,
+		Sidebar,
 		MeasurementContent,
 		SleepContent,
-		MeasurementSidebar,
-		SleepSidebar,
 		NcContent,
 		NcAppContent,
-		NcAppSidebar,
-		NcAppSidebarTab,
 		NcActionButton,
 		NcActions,
 		PersonsNavigation,
-		WeightSidebar,
-		FeelingSidebar,
-		PersonsSidebar,
-		SharingSidebar,
 		WeightContent,
 		FeelingContent,
 		PersonsContent,
-		SmokingSidebar,
 		SmokingContent,
 		ActivitiesContent,
 		MedicationContent,
@@ -168,15 +69,15 @@ export default {
 		await this.$store.dispatch('loadPersons')
 		this.loading = false
 	},
-	methods: {
-		formatMyDate(v) {
-			return moment(v).format('DD.MM.YYYY')
-		},
-	},
 }
 </script>
 <style lang="scss">
 
+	.app-content {
+		padding-left: calc(var(--default-grid-baseline) * 6) !important;
+		padding-right: calc(var(--default-grid-baseline) * 5) !important;
+	}
+
 	.content-wrapper *:after, .content-wrapper *:before{
 		-webkit-box-sizing: border-box;
 		-moz-box-sizing: border-box;
@@ -188,6 +89,10 @@ export default {
 		width: 100%;
 	}
 
+	.row.first-row {
+		margin-top: calc(var(--default-grid-baseline) * 10);
+	}
+
 	.col-1 { width: 25%; }
 
 	.col-2 { width: 50%; }
@@ -198,7 +103,7 @@ export default {
 
 	[class*='col-'] {
 		float: left;
-		padding: 15px;
+		padding: 15px 15px 0;
 		// border: 1px solid red;
 		// background-color: aqua;
 	}
@@ -247,14 +152,13 @@ export default {
 		padding: 10px;
 	}
 
-	.content-menu-topright {
+	.content-menu-top-right {
 		position: fixed;
 		right: 20px;
 		z-index: 1001;
 	}
 
 	h2 {
-		margin-top: -10px;
 		font-size: x-large;
 	}
 
diff --git a/src/Sidebar.vue b/src/Sidebar.vue
new file mode 100644
index 00000000..9845ea5f
--- /dev/null
+++ b/src/Sidebar.vue
@@ -0,0 +1,127 @@
+<template>
+	<NcAppSidebar
+		v-show="showSidebar"
+		v-if="person && !loading && canManage"
+		:title="person.name"
+		:subtitle="t('health', 'Created at {creationTime}', { creationTime: formatMyDate(person.insertTime) })"
+		@close="$store.commit('showSidebar', false)"
+	>
+		<NcAppSidebarTab
+			id="person"
+			:name="t('health', 'Person')"
+			icon="icon-user"
+			:order="0"
+		>
+			<PersonsSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			id="sharing"
+			:name="t('health', 'Share')"
+			icon="icon-share"
+			:order="0.5"
+		>
+			<SharingSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			v-if="person.enabledModuleWeight"
+			id="weight"
+			:name="t('health', 'Weight')"
+			icon="icon-quota"
+			:order="1"
+		>
+			<WeightSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			v-if="person.enabledModuleFeeling"
+			id="feeling"
+			:name="t('health', 'Feeling')"
+			icon="icon-category-monitoring"
+			:order="2"
+		>
+			<FeelingSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			v-if="person.enabledModuleMeasurement"
+			id="measurement"
+			:name="t('health', 'Measurement')"
+			icon="icon-home"
+			:order="3"
+		>
+			<MeasurementSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			v-if="person.enabledModuleSleep"
+			id="sleep"
+			:name="t('health', 'Sleep')"
+			icon="icon-download"
+			:order="4"
+		>
+			<SleepSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			v-if="person.enabledModuleSmoking"
+			id="smoking"
+			:name="t('health', 'Smoking')"
+			icon="icon-address"
+			:order="5"
+		>
+			<SmokingSidebar />
+		</NcAppSidebarTab>
+		<NcAppSidebarTab
+			v-if="person.enabledModuleActivities"
+			id="activities"
+			:name="t('health', 'Activities')"
+			icon="icon-upload"
+			:order="6"
+		>
+			<ActivitiesSidebar />
+		</NcAppSidebarTab>
+	</NcAppSidebar>
+</template>
+
+<script>
+import { NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
+import MeasurementSidebar from './modules/measurement/MeasurementSidebar.vue'
+import WeightSidebar from './modules/weight/WeightSidebar.vue'
+import SleepSidebar from './modules/sleep/SleepSidebar.vue'
+import PersonsSidebar from './modules/persons/PersonsSidebar.vue'
+import SmokingSidebar from './modules/smoking/SmokingSidebar.vue'
+import ActivitiesSidebar from './modules/activities/ActivitiesSidebar.vue'
+import SharingSidebar from './modules/persons/SharingSidebar.vue'
+import FeelingSidebar from './modules/feeling/FeelingSidebar.vue'
+import { mapGetters, mapState } from 'vuex'
+import moment from '@nextcloud/moment'
+
+export default {
+	components: {
+		MeasurementSidebar,
+		SharingSidebar,
+		ActivitiesSidebar,
+		SleepSidebar,
+		NcAppSidebarTab,
+		SmokingSidebar,
+		NcAppSidebar,
+		WeightSidebar,
+		PersonsSidebar,
+		FeelingSidebar,
+	},
+	props: {
+		loading: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		...mapState(['activePersonId', 'activeModule', 'showSidebar', 'persons', 'initialLoading']),
+		...mapGetters(['person', 'canManage']),
+	},
+	methods: {
+		formatMyDate(v) {
+			return moment(v).format('DD.MM.YYYY')
+		},
+	},
+}
+</script>
+<style scoped lang="scss">
+
+</style>
diff --git a/src/Startpage.vue b/src/Startpage.vue
new file mode 100644
index 00000000..b2b887b6
--- /dev/null
+++ b/src/Startpage.vue
@@ -0,0 +1,23 @@
+<template>
+	<div>
+		<NcEmptyContent :title="t('health', 'Health')"
+			:description="t('health', 'Track your health privately.')"
+		>
+			<template #icon>
+				<IconHealth />
+			</template>
+		</NcEmptyContent>
+	</div>
+</template>
+
+<script>
+import { NcEmptyContent } from '@nextcloud/vue'
+import IconHealth from 'vue-material-design-icons/HeartPulse.vue'
+
+export default {
+	components: {
+		NcEmptyContent,
+		IconHealth,
+	},
+}
+</script>
diff --git a/src/modules/activities/ActivitiesChart.vue b/src/modules/activities/ActivitiesChart.vue
index 97e39978..072aff9f 100644
--- a/src/modules/activities/ActivitiesChart.vue
+++ b/src/modules/activities/ActivitiesChart.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 
 export default {
 	name: 'ActivitiesChart',
diff --git a/src/modules/activities/ActivitiesTable.vue b/src/modules/activities/ActivitiesTable.vue
index 320abd2e..29422176 100644
--- a/src/modules/activities/ActivitiesTable.vue
+++ b/src/modules/activities/ActivitiesTable.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 import moment from '@nextcloud/moment'
 
 export default {
diff --git a/src/modules/feeling/FeelingChart.vue b/src/modules/feeling/FeelingChart.vue
index 094f2375..428cba2d 100644
--- a/src/modules/feeling/FeelingChart.vue
+++ b/src/modules/feeling/FeelingChart.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 
 export default {
 	name: 'FeelingChart',
diff --git a/src/modules/feeling/FeelingTable.vue b/src/modules/feeling/FeelingTable.vue
index 2c2bd79d..ad0772e3 100644
--- a/src/modules/feeling/FeelingTable.vue
+++ b/src/modules/feeling/FeelingTable.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 import moment from '@nextcloud/moment'
 
 export default {
diff --git a/src/modules/measurement/MeasurementChart.vue b/src/modules/measurement/MeasurementChart.vue
index eebe5f53..0029d49b 100644
--- a/src/modules/measurement/MeasurementChart.vue
+++ b/src/modules/measurement/MeasurementChart.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 
 export default {
 	name: 'MeasurementChart',
diff --git a/src/modules/measurement/MeasurementDetailChart.vue b/src/modules/measurement/MeasurementDetailChart.vue
index 096ad85d..550c1c3d 100644
--- a/src/modules/measurement/MeasurementDetailChart.vue
+++ b/src/modules/measurement/MeasurementDetailChart.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 
 export default {
 	name: 'MeasurementDetailChart',
diff --git a/src/modules/measurement/MeasurementTable.vue b/src/modules/measurement/MeasurementTable.vue
index 478e9c3a..c14c2474 100644
--- a/src/modules/measurement/MeasurementTable.vue
+++ b/src/modules/measurement/MeasurementTable.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 import moment from '@nextcloud/moment'
 
 export default {
diff --git a/src/modules/medication/MedicationPlanTable.vue b/src/modules/medication/MedicationPlanTable.vue
index e8d0ff57..abe82292 100644
--- a/src/modules/medication/MedicationPlanTable.vue
+++ b/src/modules/medication/MedicationPlanTable.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 
 export default {
 	name: 'MedicationPlanTable',
diff --git a/src/modules/medication/MedicationTable.vue b/src/modules/medication/MedicationTable.vue
index b283abf9..c40b8cee 100644
--- a/src/modules/medication/MedicationTable.vue
+++ b/src/modules/medication/MedicationTable.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 
 export default {
 	name: 'MedicationTable',
diff --git a/src/modules/persons/PersonsContent.vue b/src/modules/persons/PersonsContent.vue
index e04684b2..bf9fdd1f 100644
--- a/src/modules/persons/PersonsContent.vue
+++ b/src/modules/persons/PersonsContent.vue
@@ -22,8 +22,10 @@
 
 <template>
 	<div>
-		<h2>{{ t('health', 'Welcome to your health center') }}</h2>
-		<div class="row">
+		<div class="row first-row">
+			<div class="col-4">
+				<h2>{{ t('health', 'Welcome {name} to your health center', {name: person.name}) }}</h2>
+			</div>
 			<div class="col-2">
 				<textarea ref="mission"
 					class="textarea-mission"
@@ -31,6 +33,7 @@
 					:readonly="!canEdit"
 				/>
 				<button v-if="canEdit"
+					:aria-label="t('health', 'save')"
 					@click="updateMission"
 				>
 					{{ t('health', 'Save ') }}
diff --git a/src/modules/persons/PersonsNavigation.vue b/src/modules/persons/PersonsNavigation.vue
index 31c23fe5..9baf1e14 100644
--- a/src/modules/persons/PersonsNavigation.vue
+++ b/src/modules/persons/PersonsNavigation.vue
@@ -27,8 +27,7 @@
 				:key="index"
 				:title="p.name"
 				:allow-collapse="true"
-				:open="(index === 0)?true:false"
-				icon="icon-user"
+				:open="index === 0"
 				:editable="p.permissions['PERMISSION_MANAGE']"
 				:edit-label="t('health', 'Edit name')"
 				:class="(index === activePersonId)?'active-person':''"
@@ -36,8 +35,12 @@
 				@update:title="personUpdateName"
 				@click="$store.dispatch('setActivePerson', index); $store.dispatch('setActiveModule', 'person')"
 			>
-				<template v-if="p.permissions['PERMISSION_MANAGE']" slot="actions">
+				<template #icon>
+					<IconPerson :size="20" />
+				</template>
+				<template v-if="p.permissions['PERMISSION_MANAGE']" #actions>
 					<NcActionButton
+						:aria-label="t('health', 'Show details')"
 						:close-after-click="true"
 						icon="icon-details"
 						@click="$store.commit('showSidebar', true); $store.dispatch('setActivePerson', index)"
@@ -45,7 +48,7 @@
 						{{ t('health', 'Show details') }}
 					</NcActionButton>
 					<NcActionButton
-						v-show="personsLength != 1"
+						v-show="personsLength !== 1"
 						:close-after-click="true"
 						icon="icon-delete"
 						@click="$store.dispatch('deletePerson', persons[menuOpenPersonId])"
@@ -103,48 +106,32 @@
 					@click="$store.dispatch('setActivePerson', index); $store.dispatch('setActiveModule', 'medicine')"
 				/>
 			</NcAppNavigationItem>
-			<NcAppNavigationItem
+			<NcAppNavigationNewItem
 				:title="t('health', 'New person')"
-				icon="icon-add"
-				:pinned="false"
-				@click.prevent.stop="showNewPersonForm = true"
+				@new-item="createPerson"
 			>
-				<div v-show="showNewPersonForm" class="person-create">
-					<form
-						@submit.prevent.stop="createPerson"
-					>
-						<input
-							ref="newPersonName"
-							:placeholder="t('health', 'Name')"
-							type="text"
-							required
-						>
-						<input type="submit" value="" class="icon-confirm">
-						<NcActions>
-							<NcActionButton class="ab-integrated" icon="icon-close" @click.stop.prevent="closeNewPersonForm" />
-						</NcActions>
-					</form>
-				</div>
-			</NcAppNavigationItem>
+				<template #icon>
+					<IconPlus :size="20" />
+				</template>
+			</NcAppNavigationNewItem>
 		</template>
 		<template #footer>
-			<AppNavigationSettings :title="t('health', 'Information')">
+			<NcAppNavigationSettings :title="t('health', 'Information')">
 				<NcAppNavigationItem
 					:title="t('tables', 'Donations')"
 					icon="icon-category-workflow"
 					@click="openLink('https://github.com/datenangebot/health/wiki/Donations')"
 				/>
-			</AppNavigationSettings>
+			</NcAppNavigationSettings>
 		</template>
 	</NcAppNavigation>
 </template>
 
 <script>
-import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation'
-import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
-import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
-import NcActions from '@nextcloud/vue/dist/Components/NcActions'
+import { NcAppNavigation, NcAppNavigationItem, NcActionButton, NcAppNavigationSettings, NcAppNavigationNewItem } from '@nextcloud/vue'
 import { mapState, mapGetters } from 'vuex'
+import IconPlus from 'vue-material-design-icons/Plus'
+import IconPerson from 'vue-material-design-icons/Account.vue'
 
 export default {
 	name: 'PersonsNavigation',
@@ -152,7 +139,10 @@ export default {
 		NcAppNavigation,
 		NcAppNavigationItem,
 		NcActionButton,
-		NcActions,
+		NcAppNavigationSettings,
+		NcAppNavigationNewItem,
+		IconPlus,
+		IconPerson,
 	},
 	data() {
 		return {
@@ -174,12 +164,9 @@ export default {
 		openLink(link) {
 			window.open(link, '_blank')
 		},
-		createPerson(e) {
-			const name = e.currentTarget.childNodes[0].value
+		createPerson(name) {
 			this.$store.dispatch('addPerson', name)
 			this.$store.commit('showSidebar', true)
-			this.showNewPersonForm = false
-			e.currentTarget.childNodes[0].value = ''
 		},
 		personUpdateName(v) {
 			this.$store.dispatch('setValue', { id: this.persons[this.menuOpenPersonId].id, key: 'name', value: v })
@@ -191,34 +178,3 @@ export default {
 	},
 }
 </script>
-<style lang="scss" scoped>
-
-	.person-create {
-		order: 1;
-		display: flex;
-		height: 44px;
-		padding-left: 10px;
-		form {
-			display: flex;
-			flex-grow: 1;
-			input[type='text'] {
-				flex-grow: 1;
-			}
-		}
-	}
-
-	button, .button, input[type='button'], input[type='submit'], input[type='reset'] {
-		min-height: auto;
-		border-radius: var(--border-radius);
-		padding: 4px;
-	}
-
-	.app-navigation__list {
-		display: none;
-	}
-
-	.app-navigation-entry:hover {
-		background-color: var(--color-background-darker);
-	}
-
-</style>
diff --git a/src/modules/sleep/SleepChart.vue b/src/modules/sleep/SleepChart.vue
index 31c52763..453deec1 100644
--- a/src/modules/sleep/SleepChart.vue
+++ b/src/modules/sleep/SleepChart.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 import moment from '@nextcloud/moment'
 
 export default {
diff --git a/src/modules/sleep/SleepTable.vue b/src/modules/sleep/SleepTable.vue
index 79cb973e..239429c6 100644
--- a/src/modules/sleep/SleepTable.vue
+++ b/src/modules/sleep/SleepTable.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 import moment from '@nextcloud/moment'
 
 export default {
diff --git a/src/modules/smoking/SmokingChart.vue b/src/modules/smoking/SmokingChart.vue
index 70dee079..4c3019cd 100644
--- a/src/modules/smoking/SmokingChart.vue
+++ b/src/modules/smoking/SmokingChart.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 
 export default {
 	name: 'SmokingChart',
diff --git a/src/modules/smoking/SmokingTable.vue b/src/modules/smoking/SmokingTable.vue
index da9231cb..da61ad3a 100644
--- a/src/modules/smoking/SmokingTable.vue
+++ b/src/modules/smoking/SmokingTable.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 
 export default {
 	name: 'SmokingTable',
diff --git a/src/modules/weight/WeightChart.vue b/src/modules/weight/WeightChart.vue
index 9c495c07..5c4c509f 100644
--- a/src/modules/weight/WeightChart.vue
+++ b/src/modules/weight/WeightChart.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Chart from '../../general/Chart'
+import Chart from '../../shared/Chart'
 import MixinBmi from './MixinBmi'
 
 export default {
diff --git a/src/modules/weight/WeightTable.vue b/src/modules/weight/WeightTable.vue
index 8bc2d147..573ca342 100644
--- a/src/modules/weight/WeightTable.vue
+++ b/src/modules/weight/WeightTable.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import DataTable from '../../general/DataTable'
+import DataTable from '../../shared/DataTable'
 import MixinBmi from './MixinBmi'
 
 export default {
diff --git a/src/general/Chart.vue b/src/shared/Chart.vue
similarity index 100%
rename from src/general/Chart.vue
rename to src/shared/Chart.vue
diff --git a/src/general/DataTable.vue b/src/shared/DataTable.vue
similarity index 100%
rename from src/general/DataTable.vue
rename to src/shared/DataTable.vue
diff --git a/src/general/ModalItem.vue b/src/shared/ModalItem.vue
similarity index 100%
rename from src/general/ModalItem.vue
rename to src/shared/ModalItem.vue
diff --git a/src/general/charts/LineChart.js b/src/shared/charts/LineChart.js
similarity index 100%
rename from src/general/charts/LineChart.js
rename to src/shared/charts/LineChart.js
diff --git a/src/store/store.js b/src/store/store.js
index 5f7a3448..23c6d244 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -324,10 +324,6 @@ export default new Vuex.Store({
 			const persons = await personApiClient.load()
 			if (persons && persons.length > 0) {
 				commit('persons', persons)
-				if (state.activePersonId === null) {
-					dispatch('setActivePerson', 0)
-				}
-				dispatch('loadModuleContentForPerson')
 			}
 			commit('initialLoading', false)
 		},