diff --git a/src/pages/CalendarPreferencesPage.tsx b/src/pages/CalendarPreferencesPage.tsx
index ace242e7f..39c412536 100644
--- a/src/pages/CalendarPreferencesPage.tsx
+++ b/src/pages/CalendarPreferencesPage.tsx
@@ -59,16 +59,7 @@ const CalendarPreferencesPage = () => {
     };
 
     return (
-        <WithNavigation
-            previousFallbackRoute="/settings"
-            headerLeft={
-                <div className="flex items-center flex-row">
-                    <SwitchLanguageButton />
-                    <NotificationAlert />
-                </div>
-            }
-        >
-            <Breadcrumb />
+        <>
             <Typography variant="h4" className="mb-5">
                 {t('navigation.label.calendarPreferences')}
             </Typography>
@@ -84,7 +75,7 @@ const CalendarPreferencesPage = () => {
                     </Button>
                 </div>
             </div>
-        </WithNavigation>
+        </>
     );
 };
 
diff --git a/src/pages/ChangeEmail.tsx b/src/pages/ChangeEmail.tsx
index 4165295ad..23149407f 100644
--- a/src/pages/ChangeEmail.tsx
+++ b/src/pages/ChangeEmail.tsx
@@ -77,23 +77,11 @@ const ChangeEmail = () => {
     }
 
     return (
-        <WithNavigation
-            hideMenu={isMobileSM}
-            previousFallbackRoute="/settings"
-            headerLeft={
-                !isMobileSM && (
-                    <Stack alignItems="center" direction="row">
-                        <SwitchLanguageButton />
-                        <NotificationAlert />
-                    </Stack>
-                )
-            }
-        >
+        <>
             {loading || !data ? (
                 <CenterLoadingSpinner />
             ) : (
                 <Flex overflowY="auto" height="100dvh">
-                    <Breadcrumb />
                     <Box position="relative" paddingY={space['2']} justifyContent="center" alignItems="center">
                         <Logo />
                         <Heading mt={space['1']}>{t('login.setNewEmail')}</Heading>
@@ -123,7 +111,7 @@ const ChangeEmail = () => {
                     </VStack>
                 </Flex>
             )}
-        </WithNavigation>
+        </>
     );
 };
 
diff --git a/src/pages/Helpcenter.tsx b/src/pages/Helpcenter.tsx
index 2fe0de870..9ac7fa403 100644
--- a/src/pages/Helpcenter.tsx
+++ b/src/pages/Helpcenter.tsx
@@ -39,45 +39,33 @@ const HelpCenter: React.FC = () => {
 
     return (
         <AsNavigationItem path="hilfebereich">
-            <WithNavigation
-                previousFallbackRoute="/settings"
-                headerTitle="Hilfebereich"
-                headerLeft={
-                    <div className="flex items-center flex-row">
-                        <SwitchLanguageButton />
-                        <NotificationAlert />
-                    </div>
-                }
-            >
-                <div className="h-full flex flex-col">
-                    <div className="w-full max-w-5xl pb-3 px-1.5">
-                        <Breadcrumb />
-                        <Typography variant="h4" className="mb-1.5">
-                            {t('helpcenter.title')}
-                        </Typography>
-                        <SwitchUserType
-                            pupilComponent={<Typography>{t('helpcenter.subtitle.pupil')}</Typography>}
-                            studentComponent={<Typography>{t('helpcenter.subtitle.student')}</Typography>}
-                        />
-                    </div>
-                    <Tabs className="h-full" defaultValue={defaultValue}>
-                        <TabsList>
-                            {isPupil && <TabsTrigger value="faq-sus">{t('helpcenter.faq.tabName')}</TabsTrigger>}
-                            {isStudent && <TabsTrigger value="faq-huh">{t('helpcenter.faq.tabName')}</TabsTrigger>}
-                            <TabsTrigger value="contact">{t('helpcenter.contact.tabName')}</TabsTrigger>
-                        </TabsList>
-                        <TabsContent value="faq-sus" className="h-full">
-                            <IFrame src="https://www.lern-fair.de/iframe/faq-sus" title="faq" width="100%" />
-                        </TabsContent>
-                        <TabsContent value="faq-huh" className="h-full">
-                            <IFrame src="https://www.lern-fair.de/iframe/faq-huh" title="faq" width="100%" />
-                        </TabsContent>
-                        <TabsContent value="contact" className="h-full pt-4">
-                            <ContactSupportForm />
-                        </TabsContent>
-                    </Tabs>
+            <div className="h-full flex flex-col">
+                <div className="w-full max-w-5xl pb-3 px-1.5">
+                    <Typography variant="h4" className="mb-1.5">
+                        {t('helpcenter.title')}
+                    </Typography>
+                    <SwitchUserType
+                        pupilComponent={<Typography>{t('helpcenter.subtitle.pupil')}</Typography>}
+                        studentComponent={<Typography>{t('helpcenter.subtitle.student')}</Typography>}
+                    />
                 </div>
-            </WithNavigation>
+                <Tabs className="h-full" defaultValue={defaultValue}>
+                    <TabsList>
+                        {isPupil && <TabsTrigger value="faq-sus">{t('helpcenter.faq.tabName')}</TabsTrigger>}
+                        {isStudent && <TabsTrigger value="faq-huh">{t('helpcenter.faq.tabName')}</TabsTrigger>}
+                        <TabsTrigger value="contact">{t('helpcenter.contact.tabName')}</TabsTrigger>
+                    </TabsList>
+                    <TabsContent value="faq-sus" className="h-full">
+                        <IFrame src="https://www.lern-fair.de/iframe/faq-sus" title="faq" width="100%" />
+                    </TabsContent>
+                    <TabsContent value="faq-huh" className="h-full">
+                        <IFrame src="https://www.lern-fair.de/iframe/faq-huh" title="faq" width="100%" />
+                    </TabsContent>
+                    <TabsContent value="contact" className="h-full pt-4">
+                        <ContactSupportForm />
+                    </TabsContent>
+                </Tabs>
+            </div>
         </AsNavigationItem>
     );
 };
diff --git a/src/pages/ResetPassword.tsx b/src/pages/ResetPassword.tsx
index 4922aa1b3..98c5146b9 100644
--- a/src/pages/ResetPassword.tsx
+++ b/src/pages/ResetPassword.tsx
@@ -99,7 +99,6 @@ const ResetPassword: React.FC<Props> = ({ layout }) => {
                 <>
                     {layout === 'new-pw' ? (
                         <>
-                            <Breadcrumb />
                             <Box paddingY={space['2']} justifyContent="center" alignItems="center">
                                 <Logo />
                                 <Heading mt={space['1']}>{t('set_password.title')}</Heading>
@@ -183,21 +182,6 @@ const ResetPassword: React.FC<Props> = ({ layout }) => {
         return Content;
     }
 
-    return (
-        <WithNavigation
-            hideMenu={isMobileSM}
-            previousFallbackRoute={'/settings'}
-            headerLeft={
-                !isMobileSM && (
-                    <Stack alignItems="center" direction="row">
-                        <SwitchLanguageButton />
-                        <NotificationAlert />
-                    </Stack>
-                )
-            }
-        >
-            {Content}
-        </WithNavigation>
-    );
+    return <>{Content}</>;
 };
 export default ResetPassword;
diff --git a/src/pages/SessionManager.tsx b/src/pages/SessionManager.tsx
index 4e40399c3..bf8b43c39 100644
--- a/src/pages/SessionManager.tsx
+++ b/src/pages/SessionManager.tsx
@@ -44,17 +44,7 @@ const SessionManager: React.FC = () => {
     };
 
     return (
-        <WithNavigation
-            previousFallbackRoute="/settings"
-            headerTitle={t('sessionManager.title')}
-            headerLeft={
-                <div className="flex items-center flex-row">
-                    <SwitchLanguageButton />
-                    <NotificationAlert />
-                </div>
-            }
-        >
-            <Breadcrumb />
+        <>
             <Typography variant="h2" className="mb-4">
                 {t('sessionManager.title')}
             </Typography>
@@ -99,7 +89,7 @@ const SessionManager: React.FC = () => {
                         ))
                 )}
             </div>
-        </WithNavigation>
+        </>
     );
 };
 
diff --git a/src/pages/Settings.tsx b/src/pages/Settings.tsx
index c9b82b1c5..bbd3a6a19 100644
--- a/src/pages/Settings.tsx
+++ b/src/pages/Settings.tsx
@@ -37,7 +37,7 @@ import { Typography } from '@/components/Typography';
 interface SettingItemType {
     title: string;
     icon: React.ElementType;
-    mobileFallbackLink: string;
+    link: string;
     element?: JSX.Element;
     onClick?: () => void;
 }
@@ -59,6 +59,8 @@ const Settings: React.FC = () => {
     const [showDeactivate, setShowDeactivate] = useState(false);
     const [showSwitchLanguage, setShowSwitchLanguage] = useState(false);
 
+    const isSettingsRoute = location.pathname === '/settings';
+
     useEffect(() => {
         trackPageView({
             documentTitle: 'Einstellungen',
@@ -83,16 +85,16 @@ const Settings: React.FC = () => {
     const profileSettings: SettingItemType[] = [
         ...(userType !== 'screener'
             ? [
-                  { title: t('settings.general.profile'), icon: IconUser, mobileFallbackLink: '/profile' },
-                  { title: t('settings.general.notifications'), icon: IconBell, mobileFallbackLink: '/notifications' },
+                  { title: t('settings.general.profile'), icon: IconUser, link: '/settings/profile' },
+                  { title: t('settings.general.notifications'), icon: IconBell, link: '/settings/notifications' },
                   {
                       title: t('settings.general.calendarPreferences'),
                       icon: IconCalendarWeek,
-                      mobileFallbackLink: '/calendar-preferences',
+                      link: '/settings/calendar-preferences',
                   },
               ]
             : []),
-        ...(userType === 'student' ? [{ title: t('settings.general.certificates'), icon: IconCertificate, mobileFallbackLink: '/certificates' }] : []),
+        ...(userType === 'student' ? [{ title: t('settings.general.certificates'), icon: IconCertificate, link: '/settings/certificates' }] : []),
     ];
 
     const generalSettings: SettingItemType[] = [
@@ -101,43 +103,43 @@ const Settings: React.FC = () => {
                   {
                       title: t('settings.general.progress'),
                       icon: IconTrophy,
-                      mobileFallbackLink: '/progress',
+                      link: '/progress',
                   },
               ]
             : []),
         {
             title: t('settings.general.faq'),
             icon: IconHelpCircle,
-            mobileFallbackLink: '/hilfebereich',
+            link: '/settings/hilfebereich',
         },
         {
             title: t('installation.installTitle'),
             icon: IconDownload,
-            mobileFallbackLink: '/install',
+            link: '/install',
         },
         {
             title: t('settings.general.manageSessions'),
             icon: IconDevices,
-            mobileFallbackLink: '/manage-sessions',
+            link: '/settings/manage-sessions',
         },
-        ...(userType === 'student' && isMobile ? [{ title: t('settings.general.forStudents'), icon: IconBook2, mobileFallbackLink: '/knowledge-helper' }] : []),
-        ...(userType === 'pupil' && isMobile ? [{ title: t('settings.general.forPupils'), icon: IconBook2, mobileFallbackLink: '/knowledge-pupil' }] : []),
-        ...(LESSON_PLAN_GENERATOR_ACTIVE ? [{ title: t('navigation.label.lesson'), icon: IconDownload, mobileFallbackLink: '/lesson' }] : []),
-        ...(isMobile && REFERRALS_ACTIVE ? [{ title: t('navigation.label.referral'), icon: IconSpeakerphone, mobileFallbackLink: '/referral' }] : []),
+        ...(userType === 'student' && isMobile ? [{ title: t('settings.general.forStudents'), icon: IconBook2, link: '/knowledge-helper' }] : []),
+        ...(userType === 'pupil' && isMobile ? [{ title: t('settings.general.forPupils'), icon: IconBook2, link: '/knowledge-pupil' }] : []),
+        ...(LESSON_PLAN_GENERATOR_ACTIVE ? [{ title: t('navigation.label.lesson'), icon: IconDownload, link: '/lesson' }] : []),
+        ...(isMobile && REFERRALS_ACTIVE ? [{ title: t('navigation.label.referral'), icon: IconSpeakerphone, link: '/referral' }] : []),
     ];
 
     const accountSettings: SettingItemType[] = [
         ...(!roles.includes('SSO_USER')
             ? [
-                  { title: t('settings.account.changeEmail'), icon: IconMail, mobileFallbackLink: '/new-email' },
-                  { title: t('settings.account.changePassword'), icon: IconPassword, mobileFallbackLink: '/new-password' },
+                  { title: t('settings.account.changeEmail'), icon: IconMail, link: '/settings/new-email' },
+                  { title: t('settings.account.changePassword'), icon: IconPassword, link: '/settings/new-password' },
               ]
             : []),
-        { title: t('settings.account.deactivateAccount'), icon: IconUserOff, mobileFallbackLink: '#', onClick: () => setShowDeactivate(true) },
+        { title: t('settings.account.deactivateAccount'), icon: IconUserOff, link: '#', onClick: () => setShowDeactivate(true) },
         {
             title: t('settings.account.logout'),
             icon: IconLogout,
-            mobileFallbackLink: '#',
+            link: '#',
             onClick: () => {
                 trackEvent({
                     category: 'profil',
@@ -151,9 +153,9 @@ const Settings: React.FC = () => {
     ];
 
     const legalSettings: SettingItemType[] = [
-        { title: t('settings.legal.imprint'), icon: IconSectionSign, mobileFallbackLink: '/impressum' },
-        { title: t('settings.legal.datapolicy'), icon: IconShieldLock, mobileFallbackLink: '/datenschutz' },
-        { title: t('settings.legal.agb'), icon: IconLicense, mobileFallbackLink: `/${userType === 'pupil' ? 'agb-schueler' : 'agb-helfer'}` },
+        { title: t('settings.legal.imprint'), icon: IconSectionSign, link: '/impressum' },
+        { title: t('settings.legal.datapolicy'), icon: IconShieldLock, link: '/datenschutz' },
+        { title: t('settings.legal.agb'), icon: IconLicense, link: `/${userType === 'pupil' ? 'agb-schueler' : 'agb-helfer'}` },
     ];
 
     const settings = [
@@ -175,13 +177,13 @@ const Settings: React.FC = () => {
                     </Button>
                 }
             >
-                <Typography variant={'h3'} className={'mt-4 mb-11'}>
+                <Typography variant={'h3'} className={'mt-4 mb-5'}>
                     {t('settings.general.mySettings')}
                 </Typography>
-                <div id={'sidebar'}>
-                    <div className="min-w-full md:min-w-72">
-                        <nav className="flex md:min-w-72 min-w-full pr-8 flex-col h-[calc(100vh-120px)] overflow-y-auto fixed pb-10 justify-between">
-                            <div className="flex flex-col gap-y-4 ">
+                <div className={'flex'}>
+                    <div className={`min-w-full md:min-w-72 ${!isSettingsRoute && isMobile ? 'hidden' : ''}`}>
+                        <nav className="flex md:min-w-72 min-w-full flex-col h-[calc(100vh-120px)] overflow-y-auto fixed pb-10 justify-between">
+                            <div className="flex flex-col gap-y-4">
                                 {settings.map((group) => {
                                     return (
                                         <SettingRow title={group.title}>
@@ -190,8 +192,8 @@ const Settings: React.FC = () => {
                                                     <SettingItem
                                                         title={item.title}
                                                         Icon={item.icon}
-                                                        active={'/' + lastLinkItem === item.mobileFallbackLink}
-                                                        onClick={item.onClick ? item.onClick : () => navigate(item.mobileFallbackLink)}
+                                                        active={location.pathname.includes(item.link)}
+                                                        onClick={item.onClick ? item.onClick : () => navigate(item.link)}
                                                     />
                                                 );
                                             })}
@@ -201,9 +203,9 @@ const Settings: React.FC = () => {
                             </div>
                         </nav>
                     </div>
-                </div>
-                <div className={'ml-auto w-full lg:w-[80%] pl-4'}>
-                    <Outlet />
+                    <div className={`ml-auto flex-1 lg:pl-10 h-full`}>
+                        <Outlet />
+                    </div>
                 </div>
             </WithNavigation>
             <DeactivateAccountModal isOpen={showDeactivate} onOpenChange={setShowDeactivate} />
@@ -234,7 +236,7 @@ const SettingItem = ({ title, Icon, onClick, active }: { title: string; Icon: Re
             <Typography variant={'subtle'} className={'font-medium'}>
                 {title}
             </Typography>
-            <div className={'ml-auto'}>
+            <div className={'ml-auto mr-3'}>
                 <IconChevronRight />
             </div>
         </div>
diff --git a/src/pages/notification/NotficationControlPanel.tsx b/src/pages/notification/NotficationControlPanel.tsx
index e7c31910e..8e473d816 100644
--- a/src/pages/notification/NotficationControlPanel.tsx
+++ b/src/pages/notification/NotficationControlPanel.tsx
@@ -25,7 +25,7 @@ const NotificationControlPanel = () => {
     const { userPreferences, updateUserPreferences, ...rest } = useUserPreferences();
     const navigate = useNavigate();
     const [searchParams] = useSearchParams();
-    const isNewsletter = useMatch({ path: 'notifications/newsletter' });
+    const isNewsletter = useMatch({ path: 'settings/notifications/newsletter' });
     const shouldUnsubscribe = searchParams.has('unsubscribe');
 
     useEffect(() => {
@@ -64,51 +64,36 @@ const NotificationControlPanel = () => {
 
     return (
         <NotificationPreferencesContext.Provider value={{ userPreferences, updateUserPreferences, ...rest, channels }}>
-            <WithNavigation
-                hideMenu={isMobileSM}
-                previousFallbackRoute="/settings"
-                headerTitle={t('notification.controlPanel.title')}
-                headerLeft={
-                    !isMobileSM && (
-                        <Stack alignItems="center" direction="row">
-                            <SwitchLanguageButton />
-                            <NotificationAlert />
-                        </Stack>
-                    )
-                }
-            >
-                <View>
-                    <Breadcrumb />
-                    {!isMobile && (
-                        <Column space={space['1']} marginBottom={space['2']} ml={3}>
-                            <Heading>{t('notification.controlPanel.title')}</Heading>
-                            <Row>
-                                <Text bold>{t('notification.controlPanel.yourMail')}</Text>
-                                <Text> {data?.me?.email}</Text>
-                            </Row>
-                        </Column>
-                    )}
-                    <VStack flex={1}>
-                        <Tabs
-                            removeSpace
-                            currentTabIndex={isNewsletter ? 1 : 0}
-                            onPressTab={(tab) => navigate(`${tab.id}`)}
-                            tabs={[
-                                {
-                                    id: 'system',
-                                    title: t('notification.controlPanel.tabs.system.title'),
-                                    content: <Outlet />,
-                                },
-                                {
-                                    id: 'newsletter',
-                                    title: t('notification.controlPanel.tabs.newsletter.title'),
-                                    content: <Outlet />,
-                                },
-                            ]}
-                        />
-                    </VStack>
-                </View>
-            </WithNavigation>
+            <View>
+                {!isMobile && (
+                    <Column space={space['1']} marginBottom={space['2']} ml={3}>
+                        <Heading>{t('notification.controlPanel.title')}</Heading>
+                        <Row>
+                            <Text bold>{t('notification.controlPanel.yourMail')}</Text>
+                            <Text> {data?.me?.email}</Text>
+                        </Row>
+                    </Column>
+                )}
+                <VStack flex={1}>
+                    <Tabs
+                        removeSpace
+                        currentTabIndex={isNewsletter ? 1 : 0}
+                        onPressTab={(tab) => navigate(`${tab.id}`)}
+                        tabs={[
+                            {
+                                id: 'system',
+                                title: t('notification.controlPanel.tabs.system.title'),
+                                content: <Outlet />,
+                            },
+                            {
+                                id: 'newsletter',
+                                title: t('notification.controlPanel.tabs.newsletter.title'),
+                                content: <Outlet />,
+                            },
+                        ]}
+                    />
+                </VStack>
+            </View>
         </NotificationPreferencesContext.Provider>
     );
 };
diff --git a/src/pages/pupil/ProfilePupil.tsx b/src/pages/pupil/ProfilePupil.tsx
index 2ad99737d..87f89a8bb 100644
--- a/src/pages/pupil/ProfilePupil.tsx
+++ b/src/pages/pupil/ProfilePupil.tsx
@@ -205,140 +205,122 @@ const ProfilePupil: React.FC<Props> = () => {
 
     return (
         <>
-            <WithNavigation
-                isLoading={loading}
-                hideMenu={isMobileSM}
-                previousFallbackRoute="/settings"
-                headerTitle={t('profile.title')}
-                headerLeft={
-                    !isMobileSM && (
-                        <Stack alignItems="center" direction="row">
-                            <SwitchLanguageButton />
-                            <NotificationAlert />
-                        </Stack>
-                    )
-                }
-            >
-                <VStack maxWidth={ContainerWidth} paddingX={space['1']}>
-                    <Breadcrumb />
-                </VStack>
-                {(showSuccessfulChangeAlert || userSettingChanged) && <AlertMessage content={t('profile.successmessage')} />}
-                <VStack space={space['1']} width="100%" marginX="auto" maxWidth={ContainerWidth}>
-                    {profileCompleteness !== 100 && (
-                        <VStack paddingX={space['1.5']} space={space['1']}>
-                            <ProfileSettingRow title={t('profile.ProfileCompletion.name')}>
-                                <UserProgress percent={profileCompleteness} />
-                            </ProfileSettingRow>
-                        </VStack>
-                    )}
+            {(showSuccessfulChangeAlert || userSettingChanged) && <AlertMessage content={t('profile.successmessage')} />}
+            <VStack space={space['1']} width="100%" marginX="auto" maxWidth={ContainerWidth}>
+                {profileCompleteness !== 100 && (
                     <VStack paddingX={space['1.5']} space={space['1']}>
-                        <ProfileSettingRow title={t('profile.PersonalData')}>
-                            <ProfileSettingItem
-                                title={t('profile.UserName.label.title')}
-                                href={() => {
-                                    setNameModalVisible(true);
-                                }}
-                            >
-                                <Text>
-                                    {data?.me.firstname} {data?.me.lastname}
-                                </Text>
-                            </ProfileSettingItem>
-                            {data && nameModalVisible && (
-                                <PupilNameModal
-                                    firstname={data!.me.firstname}
-                                    lastname={data!.me.lastname}
-                                    onSave={onSave}
-                                    onClose={() => setNameModalVisible(false)}
-                                />
-                            )}
-
-                            <ProfileSettingItem
-                                title={t('profile.UserName.label.email')}
-                                href={() => {
-                                    navigate('/new-email');
-                                }}
-                            >
-                                <Text>{data?.me?.email}</Text>
-                            </ProfileSettingItem>
-                            <ProfileSettingItem
-                                title={t('profile.AboutMe.label')}
-                                href={() => {
-                                    setAboutMeModalVisible(true);
-                                }}
-                            >
-                                <Text>{data?.me.pupil!.aboutMe}</Text>
-                            </ProfileSettingItem>
-                            {data && aboutMeModalVisible && (
-                                <PupilAboutMeModal aboutMe={data!.me.pupil!.aboutMe} onSave={onSave} onClose={() => setAboutMeModalVisible(false)} />
-                            )}
-
-                            <ProfileSettingItem title={t('profile.Languages.labelPupil')} href={() => navigate('/change-setting/language')}>
-                                {(data?.me?.pupil?.languages?.length && (
-                                    <Row flexWrap="wrap" w="100%">
-                                        {data?.me?.pupil?.languages.map((lang: string) => (
-                                            <Column marginRight={3} mb={space['0.5']} key={lang}>
-                                                <CSSWrapper className="profil-tab-link">
-                                                    <IconTagList
-                                                        isDisabled
-                                                        icon={lang.toLowerCase()}
-                                                        text={t(`lernfair.languages.${lang.toLowerCase()}` as unknown as TemplateStringsArray)}
-                                                    />
-                                                </CSSWrapper>
-                                            </Column>
-                                        ))}
-                                    </Row>
-                                )) || <Text>{t('profile.Notice.noLanguage')}</Text>}
-                            </ProfileSettingItem>
+                        <ProfileSettingRow title={t('profile.ProfileCompletion.name')}>
+                            <UserProgress percent={profileCompleteness} />
+                        </ProfileSettingRow>
+                    </VStack>
+                )}
+                <VStack paddingX={space['1.5']} space={space['1']}>
+                    <ProfileSettingRow title={t('profile.PersonalData')}>
+                        <ProfileSettingItem
+                            title={t('profile.UserName.label.title')}
+                            href={() => {
+                                setNameModalVisible(true);
+                            }}
+                        >
+                            <Text>
+                                {data?.me.firstname} {data?.me.lastname}
+                            </Text>
+                        </ProfileSettingItem>
+                        {data && nameModalVisible && (
+                            <PupilNameModal
+                                firstname={data!.me.firstname}
+                                lastname={data!.me.lastname}
+                                onSave={onSave}
+                                onClose={() => setNameModalVisible(false)}
+                            />
+                        )}
 
-                            <ProfileSettingItem title={t('profile.State.label')} href={() => navigate('/change-setting/state')}>
-                                <Row flexWrap="wrap" w="100%">
-                                    {(data?.me?.pupil?.state && (
-                                        <Column marginRight={3} mb={space['0.5']}>
-                                            {(data?.me?.pupil?.state && (
-                                                <CSSWrapper className="profil-tab-link">
-                                                    <IconTagList
-                                                        isDisabled
-                                                        iconPath={`states/icon_${data?.me?.pupil?.state}.svg`}
-                                                        text={t(`lernfair.states.${data?.me?.pupil?.state}`)}
-                                                    />
-                                                </CSSWrapper>
-                                            )) || <Text>{t('profile.noInfo')}</Text>}
-                                        </Column>
-                                    )) || <Text>{t('profile.Notice.noState')}</Text>}
-                                </Row>
-                            </ProfileSettingItem>
+                        <ProfileSettingItem
+                            title={t('profile.UserName.label.email')}
+                            href={() => {
+                                navigate('/new-email');
+                            }}
+                        >
+                            <Text>{data?.me?.email}</Text>
+                        </ProfileSettingItem>
+                        <ProfileSettingItem
+                            title={t('profile.AboutMe.label')}
+                            href={() => {
+                                setAboutMeModalVisible(true);
+                            }}
+                        >
+                            <Text>{data?.me.pupil!.aboutMe}</Text>
+                        </ProfileSettingItem>
+                        {data && aboutMeModalVisible && (
+                            <PupilAboutMeModal aboutMe={data!.me.pupil!.aboutMe} onSave={onSave} onClose={() => setAboutMeModalVisible(false)} />
+                        )}
 
-                            <ProfileSettingItem title={t('profile.SchoolType.label')} href={() => navigate('/change-setting/school-type')}>
+                        <ProfileSettingItem title={t('profile.Languages.labelPupil')} href={() => navigate('/change-setting/language')}>
+                            {(data?.me?.pupil?.languages?.length && (
                                 <Row flexWrap="wrap" w="100%">
-                                    {(data?.me?.pupil?.schooltype && (
-                                        <Column marginRight={3} mb={space['0.5']}>
+                                    {data?.me?.pupil?.languages.map((lang: string) => (
+                                        <Column marginRight={3} mb={space['0.5']} key={lang}>
                                             <CSSWrapper className="profil-tab-link">
                                                 <IconTagList
                                                     isDisabled
-                                                    iconPath={`schooltypes/icon_${data.me.pupil?.schooltype}.svg`}
-                                                    text={t(`lernfair.schooltypes.${data?.me?.pupil?.schooltype}`)}
+                                                    icon={lang.toLowerCase()}
+                                                    text={t(`lernfair.languages.${lang.toLowerCase()}` as unknown as TemplateStringsArray)}
                                                 />
                                             </CSSWrapper>
                                         </Column>
-                                    )) || <Text>{t('profile.Notice.noSchoolType')}</Text>}
+                                    ))}
                                 </Row>
-                            </ProfileSettingItem>
+                            )) || <Text>{t('profile.Notice.noLanguage')}</Text>}
+                        </ProfileSettingItem>
 
-                            <ProfileSettingItem title={t('profile.SchoolClass.label')} href={() => navigate('/change-setting/class')}>
-                                <Row flexWrap="wrap" w="100%">
-                                    {(data?.me?.pupil?.gradeAsInt && (
-                                        <Column marginRight={3} mb={space['0.5']}>
+                        <ProfileSettingItem title={t('profile.State.label')} href={() => navigate('/change-setting/state')}>
+                            <Row flexWrap="wrap" w="100%">
+                                {(data?.me?.pupil?.state && (
+                                    <Column marginRight={3} mb={space['0.5']}>
+                                        {(data?.me?.pupil?.state && (
                                             <CSSWrapper className="profil-tab-link">
-                                                <GradeTag grade={data?.me?.pupil?.gradeAsInt} />
+                                                <IconTagList
+                                                    isDisabled
+                                                    iconPath={`states/icon_${data?.me?.pupil?.state}.svg`}
+                                                    text={t(`lernfair.states.${data?.me?.pupil?.state}`)}
+                                                />
                                             </CSSWrapper>
-                                        </Column>
-                                    )) || <Text>{t('profile.Notice.noSchoolGrade')}</Text>}
-                                </Row>
-                            </ProfileSettingItem>
-                        </ProfileSettingRow>
-                    </VStack>
+                                        )) || <Text>{t('profile.noInfo')}</Text>}
+                                    </Column>
+                                )) || <Text>{t('profile.Notice.noState')}</Text>}
+                            </Row>
+                        </ProfileSettingItem>
+
+                        <ProfileSettingItem title={t('profile.SchoolType.label')} href={() => navigate('/change-setting/school-type')}>
+                            <Row flexWrap="wrap" w="100%">
+                                {(data?.me?.pupil?.schooltype && (
+                                    <Column marginRight={3} mb={space['0.5']}>
+                                        <CSSWrapper className="profil-tab-link">
+                                            <IconTagList
+                                                isDisabled
+                                                iconPath={`schooltypes/icon_${data.me.pupil?.schooltype}.svg`}
+                                                text={t(`lernfair.schooltypes.${data?.me?.pupil?.schooltype}`)}
+                                            />
+                                        </CSSWrapper>
+                                    </Column>
+                                )) || <Text>{t('profile.Notice.noSchoolType')}</Text>}
+                            </Row>
+                        </ProfileSettingItem>
+
+                        <ProfileSettingItem title={t('profile.SchoolClass.label')} href={() => navigate('/change-setting/class')}>
+                            <Row flexWrap="wrap" w="100%">
+                                {(data?.me?.pupil?.gradeAsInt && (
+                                    <Column marginRight={3} mb={space['0.5']}>
+                                        <CSSWrapper className="profil-tab-link">
+                                            <GradeTag grade={data?.me?.pupil?.gradeAsInt} />
+                                        </CSSWrapper>
+                                    </Column>
+                                )) || <Text>{t('profile.Notice.noSchoolGrade')}</Text>}
+                            </Row>
+                        </ProfileSettingItem>
+                    </ProfileSettingRow>
                 </VStack>
-            </WithNavigation>
+            </VStack>
         </>
     );
 };
diff --git a/src/pages/student/Certificates.tsx b/src/pages/student/Certificates.tsx
index a095cd75c..4850906cb 100644
--- a/src/pages/student/Certificates.tsx
+++ b/src/pages/student/Certificates.tsx
@@ -85,59 +85,47 @@ const CertificatesPage: React.FC = () => {
 
     return (
         <>
-            <WithNavigation
-                headerTitle={t('appointment.title')}
-                previousFallbackRoute="/settings"
-                headerLeft={
-                    <div className="flex items-center">
-                        <SwitchLanguageButton />
-                        <NotificationAlert />
-                    </div>
-                }
-            >
-                <Breadcrumb />
-                <Typography variant="h2" className="mb-4">
-                    {t('certificates.title')}
-                </Typography>
-                <Typography variant="h3" className="mb-4">
-                    {t('certificates.instantCertificate.title')}
-                </Typography>
-                <div className="flex flex-col">
-                    <BulletList bulletPoints={t('certificates.instantCertificate.bullets', { returnObjects: true })} />
-                </div>
-                <Button onClick={() => setShowSelectInstantPDFLanguageModal(true)} className="my-2" isLoading={requestInstantCertificateFetching}>
-                    {t('certificates.instantCertificate.request')}
-                </Button>
-
-                <Modal isOpen={showSelectInstantPDFLanguageModal} onOpenChange={setShowSelectInstantPDFLanguageModal} className="w-[400px]">
-                    <ModalHeader>
-                        <ModalTitle>{t('certificate.download.download_certificate')}</ModalTitle>
-                    </ModalHeader>
-                    <div className="flex flex-col gap-2">
-                        <Button className="w-full" onClick={() => downloadInstantCertificate('de')}>
-                            {t('certificate.download.german_version')}
-                        </Button>
-                        <Button className="w-full" onClick={() => downloadInstantCertificate('en')}>
-                            {t('certificate.download.english_version')}
-                        </Button>
-                    </div>
-                </Modal>
+            <Typography variant="h2" className="mb-4">
+                {t('certificates.title')}
+            </Typography>
+            <Typography variant="h3" className="mb-4">
+                {t('certificates.instantCertificate.title')}
+            </Typography>
+            <div className="flex flex-col">
+                <BulletList bulletPoints={t('certificates.instantCertificate.bullets', { returnObjects: true })} />
+            </div>
+            <Button onClick={() => setShowSelectInstantPDFLanguageModal(true)} className="my-2" isLoading={requestInstantCertificateFetching}>
+                {t('certificates.instantCertificate.request')}
+            </Button>
 
-                <Typography variant="h3" className="mb-4 mt-4">
-                    {t('certificates.participationCertificate.title')}
-                </Typography>
-                <div className="flex flex-col">
-                    <BulletList bulletPoints={t('certificates.participationCertificate.bullets', { returnObjects: true })} />
+            <Modal isOpen={showSelectInstantPDFLanguageModal} onOpenChange={setShowSelectInstantPDFLanguageModal} className="w-[400px]">
+                <ModalHeader>
+                    <ModalTitle>{t('certificate.download.download_certificate')}</ModalTitle>
+                </ModalHeader>
+                <div className="flex flex-col gap-2">
+                    <Button className="w-full" onClick={() => downloadInstantCertificate('de')}>
+                        {t('certificate.download.german_version')}
+                    </Button>
+                    <Button className="w-full" onClick={() => downloadInstantCertificate('en')}>
+                        {t('certificate.download.english_version')}
+                    </Button>
                 </div>
-                <Button onClick={handleRequestCertificate} className="my-2">
-                    {t('profile.Helper.certificate.button')}
-                </Button>
-                <div className="flex flex-row gap-3">
-                    {data?.me.student?.participationCertificates.map((certificate, i) => (
-                        <MatchCertificateCard certificate={certificate} key={i} />
-                    ))}
-                </div>
-            </WithNavigation>
+            </Modal>
+
+            <Typography variant="h3" className="mb-4 mt-4">
+                {t('certificates.participationCertificate.title')}
+            </Typography>
+            <div className="flex flex-col">
+                <BulletList bulletPoints={t('certificates.participationCertificate.bullets', { returnObjects: true })} />
+            </div>
+            <Button onClick={handleRequestCertificate} className="my-2">
+                {t('profile.Helper.certificate.button')}
+            </Button>
+            <div className="flex flex-row gap-3">
+                {data?.me.student?.participationCertificates.map((certificate, i) => (
+                    <MatchCertificateCard certificate={certificate} key={i} />
+                ))}
+            </div>
         </>
     );
 };
diff --git a/src/pages/student/ProfileStudent.tsx b/src/pages/student/ProfileStudent.tsx
index 4975190cb..04bb22f02 100644
--- a/src/pages/student/ProfileStudent.tsx
+++ b/src/pages/student/ProfileStudent.tsx
@@ -139,138 +139,125 @@ const ProfileStudent: React.FC<Props> = () => {
 
     return (
         <>
-            <WithNavigation
-                isLoading={loading}
-                previousFallbackRoute="/settings"
-                headerTitle={t('profile.title')}
-                headerLeft={
-                    <div className="flex items-center">
-                        <SwitchLanguageButton />
-                        <NotificationAlert />
+            <div className="max-w-5xl px-5">
+                {profileCompleteness !== 100 && (
+                    <ProfileSettingRow title={t('profile.ProfileCompletion.name')}>
+                        <UserProgress percent={profileCompleteness} />
+                    </ProfileSettingRow>
+                )}
+                <div className="flex flex-col gap-y-2">
+                    {/* NAME */}
+                    <div className="w-full">
+                        <Label htmlFor="name" className="mb-2">
+                            {t('profile.UserName.label.title')}
+                        </Label>
+                        <Input name="name" className="w-full" value={`${data?.me?.firstname ?? ''} ${data?.me?.lastname ?? ''}`} disabled />
                     </div>
-                }
-            >
-                <div className="max-w-5xl px-5">
-                    <Breadcrumb />
-                    {profileCompleteness !== 100 && (
-                        <ProfileSettingRow title={t('profile.ProfileCompletion.name')}>
-                            <UserProgress percent={profileCompleteness} />
-                        </ProfileSettingRow>
-                    )}
-                    <div className="flex flex-col gap-y-2">
-                        {/* NAME */}
-                        <div className="w-full">
-                            <Label htmlFor="name" className="mb-2">
-                                {t('profile.UserName.label.title')}
-                            </Label>
-                            <Input name="name" className="w-full" value={`${data?.me?.firstname ?? ''} ${data?.me?.lastname ?? ''}`} disabled />
-                        </div>
 
-                        {/* E-MAIL */}
-                        <div className="w-full">
-                            <div className="flex items-center mb-2 gap-x-2">
-                                <Label htmlFor="email">{t('profile.UserName.label.email')}</Label>
-                                <Button
-                                    variant="none"
-                                    className="size-auto p-0"
-                                    onClick={() => {
-                                        navigate('/new-email');
-                                    }}
-                                >
-                                    <IconEdit size={18} className="text-primary inline-block" />
-                                </Button>
-                            </div>
-
-                            <Input name="email" className="w-full" value={data?.me?.email ?? ''} disabled />
+                    {/* E-MAIL */}
+                    <div className="w-full">
+                        <div className="flex items-center mb-2 gap-x-2">
+                            <Label htmlFor="email">{t('profile.UserName.label.email')}</Label>
+                            <Button
+                                variant="none"
+                                className="size-auto p-0"
+                                onClick={() => {
+                                    navigate('/new-email');
+                                }}
+                            >
+                                <IconEdit size={18} className="text-primary inline-block" />
+                            </Button>
                         </div>
 
-                        {/* ABOUT ME */}
-                        <div className="mb-2">
-                            <Label htmlFor="aboutMe" className="mt-2">
-                                {t('profile.AboutMe.label')}
+                        <Input name="email" className="w-full" value={data?.me?.email ?? ''} disabled />
+                    </div>
+
+                    {/* ABOUT ME */}
+                    <div className="mb-2">
+                        <Label htmlFor="aboutMe" className="mt-2">
+                            {t('profile.AboutMe.label')}
+                        </Label>
+                        <TextArea
+                            className="resize-none h-20 w-full"
+                            id="aboutMe"
+                            value={profile.aboutMe}
+                            onChangeText={(text) => {
+                                setProfile({ ...profile, aboutMe: text });
+                            }}
+                        />
+                    </div>
+                    {/* ZIP CODE */}
+                    <div>
+                        <Label>
+                            {t('profile.ZipCode.zipCode')}{' '}
+                            <TooltipButton className="max-w-80" tooltipContent={t('registration.steps.zipCode.descriptionStudent')}>
+                                <IconInfoCircleFilled size="16px" />
+                            </TooltipButton>
+                        </Label>
+                        <Input
+                            maxLength={zipCodeLength()}
+                            type="number"
+                            className="w-full max-w-[150px]"
+                            value={profile.zipCode}
+                            onChangeText={(e) => setProfile({ ...profile, zipCode: e.replace(/\D/g, '') })} // Ensures that only digits can pe typed in
+                            onKeyDown={(evt) => ['e', 'E', '+', '-'].includes(evt.key) && evt.preventDefault()}
+                            errorMessage={showZipcodeError() ? t('profile.ZipCode.requiredLength', { length: zipCodeLength() }) : undefined}
+                        />
+                    </div>
+                    {/* GENDER */}
+                    <div className="flex flex-col gap-y-1 max-w-[500px] overflow-hidden w-full mb-3">
+                        <div className="flex flex-col gap-y-2">
+                            <Label>
+                                {t('registration.steps.userGender.title')}{' '}
+                                <TooltipButton className="max-w-80" tooltipContent={t('registration.steps.userGender.description')}>
+                                    <IconInfoCircleFilled size="16px" />
+                                </TooltipButton>
                             </Label>
-                            <TextArea
-                                className="resize-none h-20 w-full"
-                                id="aboutMe"
-                                value={profile.aboutMe}
-                                onChangeText={(text) => {
-                                    setProfile({ ...profile, aboutMe: text });
+                            <GenderSelector
+                                className="flex flex-wrap justify-center p-1"
+                                toggleConfig={{
+                                    variant: 'outline',
+                                    size: 'lg',
+                                    className: 'justify-start w-[48%] md:w-[49%] font-semibold h-[48px]',
                                 }}
+                                value={profile.gender as unknown as Gender}
+                                setValue={(gender) => setProfile({ ...profile, gender: gender as unknown as Gender_Enum })}
                             />
                         </div>
-                        {/* ZIP CODE */}
-                        <div>
+                    </div>
+                    {/* LANGUAGES */}
+                    <div className="flex flex-col gap-y-1 max-w-[500px] overflow-hidden w-full">
+                        <div className="flex flex-col gap-y-2">
                             <Label>
-                                {t('profile.ZipCode.zipCode')}{' '}
-                                <TooltipButton className="max-w-80" tooltipContent={t('registration.steps.zipCode.descriptionStudent')}>
+                                {t('profile.Languages.labelStudent')}{' '}
+                                <TooltipButton className="max-w-80" tooltipContent={t('registration.steps.languages.descriptionStudent')}>
                                     <IconInfoCircleFilled size="16px" />
                                 </TooltipButton>
                             </Label>
-                            <Input
-                                maxLength={zipCodeLength()}
-                                type="number"
-                                className="w-full max-w-[150px]"
-                                value={profile.zipCode}
-                                onChangeText={(e) => setProfile({ ...profile, zipCode: e.replace(/\D/g, '') })} // Ensures that only digits can pe typed in
-                                onKeyDown={(evt) => ['e', 'E', '+', '-'].includes(evt.key) && evt.preventDefault()}
-                                errorMessage={showZipcodeError() ? t('profile.ZipCode.requiredLength', { length: zipCodeLength() }) : undefined}
+                            <LanguageSelector
+                                maxVisibleItems={8}
+                                className="flex flex-wrap justify-center p-1"
+                                searchConfig={{
+                                    containerClassName: 'w-full',
+                                    className: 'bg-white',
+                                    placeholder: t('otherLanguages'),
+                                }}
+                                toggleConfig={{
+                                    variant: 'outline',
+                                    size: 'lg',
+                                    className: 'justify-start w-[48%] md:w-[49%] font-semibold h-[48px]',
+                                }}
+                                multiple
+                                value={profile.languages as unknown as Language[]}
+                                setValue={(languages) => setProfile({ ...profile, languages })}
                             />
                         </div>
-                        {/* GENDER */}
-                        <div className="flex flex-col gap-y-1 max-w-[500px] overflow-hidden w-full mb-3">
-                            <div className="flex flex-col gap-y-2">
-                                <Label>
-                                    {t('registration.steps.userGender.title')}{' '}
-                                    <TooltipButton className="max-w-80" tooltipContent={t('registration.steps.userGender.description')}>
-                                        <IconInfoCircleFilled size="16px" />
-                                    </TooltipButton>
-                                </Label>
-                                <GenderSelector
-                                    className="flex flex-wrap justify-center p-1"
-                                    toggleConfig={{
-                                        variant: 'outline',
-                                        size: 'lg',
-                                        className: 'justify-start w-[48%] md:w-[49%] font-semibold h-[48px]',
-                                    }}
-                                    value={profile.gender as unknown as Gender}
-                                    setValue={(gender) => setProfile({ ...profile, gender: gender as unknown as Gender_Enum })}
-                                />
-                            </div>
-                        </div>
-                        {/* LANGUAGES */}
-                        <div className="flex flex-col gap-y-1 max-w-[500px] overflow-hidden w-full">
-                            <div className="flex flex-col gap-y-2">
-                                <Label>
-                                    {t('profile.Languages.labelStudent')}{' '}
-                                    <TooltipButton className="max-w-80" tooltipContent={t('registration.steps.languages.descriptionStudent')}>
-                                        <IconInfoCircleFilled size="16px" />
-                                    </TooltipButton>
-                                </Label>
-                                <LanguageSelector
-                                    maxVisibleItems={8}
-                                    className="flex flex-wrap justify-center p-1"
-                                    searchConfig={{
-                                        containerClassName: 'w-full',
-                                        className: 'bg-white',
-                                        placeholder: t('otherLanguages'),
-                                    }}
-                                    toggleConfig={{
-                                        variant: 'outline',
-                                        size: 'lg',
-                                        className: 'justify-start w-[48%] md:w-[49%] font-semibold h-[48px]',
-                                    }}
-                                    multiple
-                                    value={profile.languages as unknown as Language[]}
-                                    setValue={(languages) => setProfile({ ...profile, languages })}
-                                />
-                            </div>
-                        </div>
-                        <Button className="mt-6 min-w-[400px]" onClick={handleOnSave} isLoading={isUpdating} disabled={showZipcodeError()}>
-                            {t('save')}
-                        </Button>
                     </div>
+                    <Button className="mt-6 min-w-[400px]" onClick={handleOnSave} isLoading={isUpdating} disabled={showZipcodeError()}>
+                        {t('save')}
+                    </Button>
                 </div>
-            </WithNavigation>
+            </div>
         </>
     );
 };
diff --git a/src/routing/NavigatorLazy.tsx b/src/routing/NavigatorLazy.tsx
index a412d8a9d..1f6fdba38 100644
--- a/src/routing/NavigatorLazy.tsx
+++ b/src/routing/NavigatorLazy.tsx
@@ -117,33 +117,12 @@ export default function NavigatorLazy() {
                 }
             />
 
-            <Route
-                path="/profile"
-                element={
-                    <RequireAuth>
-                        <SwitchUserType pupilComponent={<ProfilePupil />} studentComponent={<ProfileStudent />} />
-                    </RequireAuth>
-                }
-            />
-            <Route
-                path="/certificates"
-                element={
-                    <RequireAuth>
-                        <CertificatesPage />
-                    </RequireAuth>
-                }
-            />
+            <Route path="/profile" element={<Navigate to={'/settings/profile'} replace />} />
+            <Route path="/certificates" element={<Navigate to={'/settings/certificates'} replace />} />
 
-            <Route
-                path="/notifications"
-                element={
-                    <RequireAuth>
-                        <NotficationControlPanel />
-                    </RequireAuth>
-                }
-            >
-                <Route path="system" element={<SystemNotifications />} />
-                <Route path="newsletter" element={<MarketingNotifications />} />
+            <Route path="/notifications" element={<Navigate to={'/settings/notifications'} replace />}>
+                <Route path="system" element={<Navigate to={'/settings/notifications/system'} replace />} />
+                <Route path="newsletter" element={<Navigate to={'/settings/notifications/newsletter'} replace />} />
                 <Route index element={<Navigate to="system" />} />
             </Route>
 
@@ -155,7 +134,69 @@ export default function NavigatorLazy() {
                     </RequireAuth>
                 }
             >
-                {/*Add Routes for Settings outlet here*/}
+                <Route index element={isMobileSM ? null : <Navigate to="/settings/profile" replace />} />
+                <Route
+                    path="profile"
+                    element={
+                        <RequireAuth>
+                            <SwitchUserType pupilComponent={<ProfilePupil />} studentComponent={<ProfileStudent />} />
+                        </RequireAuth>
+                    }
+                />
+                <Route
+                    path="notifications"
+                    element={
+                        <RequireAuth>
+                            <NotficationControlPanel />
+                        </RequireAuth>
+                    }
+                >
+                    <Route path="system" element={<SystemNotifications />} />
+                    <Route path="newsletter" element={<MarketingNotifications />} />
+                    <Route index element={<Navigate to="system" />} />
+                </Route>
+                <Route
+                    path="hilfebereich"
+                    element={
+                        <RequireAuth>
+                            <HelpCenter />
+                        </RequireAuth>
+                    }
+                ></Route>
+                <Route
+                    path="new-email"
+                    element={
+                        <RequireAuth>
+                            <ChangeEmail />
+                        </RequireAuth>
+                    }
+                />
+                <Route
+                    path="certificates"
+                    element={
+                        <RequireAuth>
+                            <CertificatesPage />
+                        </RequireAuth>
+                    }
+                />
+                <Route
+                    path="manage-sessions"
+                    element={
+                        <RequireAuth>
+                            <SessionManager />
+                        </RequireAuth>
+                    }
+                />
+                <Route path="new-password" element={<ResetPassword layout="new-pw" />} />
+                <Route path="reset-password" element={<ForgotPassword />} />
+                <Route
+                    path="calendar-preferences"
+                    element={
+                        <RequireAuth>
+                            <CalendarPreferencesPage />
+                        </RequireAuth>
+                    }
+                />
             </Route>
 
             <Route
@@ -172,14 +213,7 @@ export default function NavigatorLazy() {
                 <Route path="class" element={<ChangeSettingSchoolClass />} />
             </Route>
 
-            <Route
-                path="/hilfebereich"
-                element={
-                    <RequireAuth>
-                        <HelpCenter />
-                    </RequireAuth>
-                }
-            ></Route>
+            <Route path="/hilfebereich" element={<Navigate to={'/settings/hilfebereich'} replace />}></Route>
 
             <Route
                 path="/request-certificate"
@@ -416,35 +450,14 @@ export default function NavigatorLazy() {
 
             <Route path="/verify-email" element={<VerifyEmail />} />
             <Route path="/verify-email-change" element={<VerifyEmailChange />} />
-            <Route
-                path="/new-email"
-                element={
-                    <RequireAuth>
-                        <ChangeEmail />
-                    </RequireAuth>
-                }
-            />
-            <Route path="/new-password" element={<ResetPassword layout="new-pw" />} />
+            <Route path="/new-email" element={<Navigate to={'/settings/new-email'} replace />} />
+            <Route path="/new-password" element={<Navigate to={'/settings/new-password'} replace />} />
             <Route path="/reset-password" element={<ForgotPassword />} />
 
             <Route path="/install" element={<InstallApp />} />
 
-            <Route
-                path="/manage-sessions"
-                element={
-                    <RequireAuth>
-                        <SessionManager />
-                    </RequireAuth>
-                }
-            />
-            <Route
-                path="/calendar-preferences"
-                element={
-                    <RequireAuth>
-                        <CalendarPreferencesPage />
-                    </RequireAuth>
-                }
-            />
+            <Route path="/manage-sessions" element={<Navigate to={'/settings/manage-sessions'} replace />} />
+            <Route path="/calendar-preferences" element={<Navigate to={'/settings/calendar-preferences'} replace />} />
             <Route
                 path="/datenschutz"
                 element={