diff --git a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
index 74ce8343..309e6474 100644
--- a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
+++ b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx
@@ -89,14 +89,17 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
   const [minimizedState, setMinimized] = useLocalStorage<boolean>('navigation_minimized', {
     usingJson: true,
   })
-  const [debouncedMinimized] = useDebouncedValue(minimizedState, minimizeAnimationDuration)
+  const [debouncedMinimized] = useDebouncedValue(
+    collapseNavigation || minimizedState,
+    minimizeAnimationDuration,
+  )
   // only use debounced State if value is false because otherwise the text is formatted weirdly if you expand the navigation
-  const minimized = minimizedState || debouncedMinimized
+  const minimized = opened ? false : minimizedState || !!debouncedMinimized
 
   const location = useLocation()
   const navigationType = useNavigationType()
 
-  const showHeader = useIsSmallerBreakpoint('md') || collapseNavigation
+  const showHeader = useIsSmallerBreakpoint('md')
   const auth = useAuthenticationContext()
 
   useEffect(() => {
@@ -126,9 +129,9 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
     <AppShell
       header={{ collapsed: !showHeader, height: 60 }}
       navbar={{
-        width: minimizedState ? 70 : 300,
+        width: collapseNavigation || minimizedState ? 70 : 300,
         breakpoint: 'md',
-        collapsed: { mobile: !opened, desktop: !opened && collapseNavigation },
+        collapsed: { mobile: !opened, desktop: false },
       }}
       styles={{
         navbar: {
@@ -139,12 +142,7 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
     >
       <AppShell.Header>
         <Group h='100%' px='md'>
-          <Burger
-            opened={opened}
-            onClick={toggle}
-            hiddenFrom={collapseNavigation ? undefined : 'md'}
-            size='md'
-          />
+          <Burger opened={opened} onClick={toggle} hiddenFrom='md' size='md' />
         </Group>
       </AppShell.Header>
 
@@ -204,17 +202,19 @@ const AuthenticatedArea = (props: PropsWithChildren<IAuthenticatedAreaProps>) =>
             </Tooltip>
             {!minimized && <span>Logout</span>}
           </Link>
-          <Group>
-            <ActionIcon
-              visibleFrom='md'
-              ml='auto'
-              mr={minimized ? 'auto' : undefined}
-              variant='transparent'
-              onClick={() => setMinimized((prev) => !prev)}
-            >
-              {minimized ? <CaretDoubleRight /> : <CaretDoubleLeft />}
-            </ActionIcon>
-          </Group>
+          {!collapseNavigation && (
+            <Group>
+              <ActionIcon
+                visibleFrom='md'
+                ml='auto'
+                mr={minimized ? 'auto' : undefined}
+                variant='transparent'
+                onClick={() => setMinimized((prev) => !prev)}
+              >
+                {minimized ? <CaretDoubleRight /> : <CaretDoubleLeft />}
+              </ActionIcon>
+            </Group>
+          )}
         </AppShell.Section>
       </AppShell.Navbar>
 
diff --git a/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx b/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
index 5887fb7d..379b5371 100644
--- a/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
+++ b/client/src/components/ApplicationReviewForm/ApplicationReviewForm.tsx
@@ -61,7 +61,7 @@ const ApplicationReviewForm = (props: IApplicationReviewFormProps) => {
         title: application.topic?.title || application.thesisTitle || '',
         comment: application.comment || '',
         type:
-          application.topic?.type || GLOBAL_CONFIG.thesis_types[application.user.studyDegree || '']
+          application.thesisType || GLOBAL_CONFIG.thesis_types[application.user.studyDegree || '']
             ? application.user.studyDegree
             : null,
         advisors: application.topic?.advisors.map((advisor) => advisor.userId) ?? [],
diff --git a/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx b/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
index 2c88c558..62d6c0b8 100644
--- a/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
+++ b/client/src/components/AuthenticatedFilePreview/AuthenticatedFilePreview.tsx
@@ -1,7 +1,9 @@
 import { useMemo, useState } from 'react'
-import { Button, Space, Stack, Text } from '@mantine/core'
+import { Button, Center, Group, Space, Stack, Text } from '@mantine/core'
 import { downloadFile } from '../../utils/blob'
 import { useApiFile } from '../../hooks/fetcher'
+import { Link } from 'react-router-dom'
+import { GLOBAL_CONFIG } from '../../config/global'
 
 interface IAuthenticatedIframeProps {
   url: string
@@ -9,10 +11,11 @@ interface IAuthenticatedIframeProps {
   title?: string
   height?: number
   allowDownload?: boolean
+  includeLink?: boolean
 }
 
 const AuthenticatedFilePreview = (props: IAuthenticatedIframeProps) => {
-  const { url, filename, allowDownload = true, title, height } = props
+  const { url, filename, allowDownload = true, includeLink = false, title, height } = props
 
   const [file, setFile] = useState<File>()
 
@@ -27,12 +30,23 @@ const AuthenticatedFilePreview = (props: IAuthenticatedIframeProps) => {
       {title && <Text ta='center'>{title}</Text>}
       <iframe style={{ border: 0 }} height={height} src={iframeUrl} />
       {allowDownload && (
-        <>
-          <Space mb='md' />
-          <Button variant='outline' mx='auto' onClick={() => file && downloadFile(file)}>
-            Download
-          </Button>
-        </>
+        <Center>
+          <Group mt='md'>
+            <Button variant='outline' onClick={() => file && downloadFile(file)}>
+              Download
+            </Button>
+            {includeLink && (
+              <Button
+                component={Link}
+                to={`${GLOBAL_CONFIG.server_host}/api${url}`}
+                variant='outline'
+                target='_blank'
+              >
+                View File
+              </Button>
+            )}
+          </Group>
+        </Center>
       )}
     </Stack>
   )
diff --git a/client/src/components/DocumentEditor/DocumentEditor.tsx b/client/src/components/DocumentEditor/DocumentEditor.tsx
index 7854df1b..2ee9e83a 100644
--- a/client/src/components/DocumentEditor/DocumentEditor.tsx
+++ b/client/src/components/DocumentEditor/DocumentEditor.tsx
@@ -105,6 +105,7 @@ const DocumentEditor = (props: IDocumentEditorProps) => {
         style={{
           minHeight: editMode ? '170px' : undefined,
           borderColor: wrapperProps.error ? 'var(--mantine-color-error)' : undefined,
+          borderStyle: editMode ? 'solid' : 'dashed',
         }}
       >
         {editMode && (
diff --git a/client/src/components/GanttChart/GanttChart.tsx b/client/src/components/GanttChart/GanttChart.tsx
index 30ef6280..7f8cd219 100644
--- a/client/src/components/GanttChart/GanttChart.tsx
+++ b/client/src/components/GanttChart/GanttChart.tsx
@@ -306,6 +306,7 @@ const GanttChart = (props: IGanttChartProps) => {
           onTouchStart={handleTouchStart}
           onTouchMove={handleTouchMove}
           onWheel={handleWheel}
+          style={{ touchAction: 'none' }}
         >
           {groups.map((group) => (
             <div key={group.groupId} className={classes.groupRow}>
diff --git a/client/src/components/TopicData/TopicData.tsx b/client/src/components/TopicData/TopicData.tsx
index d30e5e66..c899dde5 100644
--- a/client/src/components/TopicData/TopicData.tsx
+++ b/client/src/components/TopicData/TopicData.tsx
@@ -34,8 +34,14 @@ const TopicData = (props: ITopicDataProps) => {
         </Grid.Col>
         <Grid.Col span={{ md: 3 }}>
           <LabeledItem
-            label='Type'
-            value={topic.type ? (GLOBAL_CONFIG.thesis_types[topic.type] ?? topic.type) : 'Any'}
+            label='Thesis Types'
+            value={
+              topic.thesisTypes
+                ? topic.thesisTypes.map(
+                    (thesisType) => GLOBAL_CONFIG.thesis_types[thesisType] ?? thesisType,
+                  )
+                : 'Any'
+            }
           />
         </Grid.Col>
         <Grid.Col span={{ md: 3 }}>
diff --git a/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx b/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
index e7cbd86a..788749ed 100644
--- a/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
+++ b/client/src/pages/LandingPage/components/PublishedTheses/PublishedTheses.tsx
@@ -114,6 +114,7 @@ const PublishedTheses = () => {
             <ThesisData thesis={openedThesis} additionalInformation={['abstract']} />
             <AuthenticatedFilePreview
               url={`/v2/published-theses/${openedThesis.thesisId}/thesis`}
+              includeLink
               height={500}
               filename={`${openedThesis.title.replaceAll(' ', '-')}.pdf`}
             />
diff --git a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
index bfab5814..e8b53ea4 100644
--- a/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
+++ b/client/src/pages/LegacySubmitApplicationPage/LegacySubmitApplicationPage.tsx
@@ -13,6 +13,7 @@ import {
   Title,
   TextInput,
   Grid,
+  Card,
 } from '@mantine/core'
 import { DeclarationOfDataConsent } from '../../components/DeclarationOfDataConsent/DeclarationOfDataConsent'
 import LS1Logo from '../../static/ls1logo.png'
@@ -27,7 +28,6 @@ import UploadArea from '../../components/UploadArea/UploadArea'
 import ContentContainer from '../../app/layout/ContentContainer/ContentContainer'
 import { AVAILABLE_COUNTRIES } from '../../config/countries'
 import { showSimpleError, showSimpleSuccess } from '../../utils/notification'
-import { LegacySuccessfulSubmission } from './components/LegacySuccessfulSubmission/LegacySuccessfulSubmission'
 import { getApiResponseErrorMessage } from '../../requests/handler'
 import DocumentEditor from '../../components/DocumentEditor/DocumentEditor'
 import { getHtmlTextLength } from '../../utils/validation'
@@ -63,6 +63,7 @@ const LegacySubmitApplicationPage = () => {
       projects: '',
       interests: '',
       thesisTitle: '',
+      thesisType: null,
       declarationOfConsentAccepted: false,
       examinationReport: undefined,
       cv: undefined,
@@ -118,6 +119,7 @@ const LegacySubmitApplicationPage = () => {
           return 'The maximum allowed number of characters is 200.'
         }
       },
+      thesisType: isNotEmpty('Please state your thesis type.'),
       studyDegree: isNotEmpty('Please state your study degree.'),
       studyProgram: isNotEmpty('Please state your study program.'),
       enrolledAt: isNotEmpty('Please state your enrollment date.'),
@@ -150,10 +152,21 @@ const LegacySubmitApplicationPage = () => {
       <Box mx='auto' pos='relative'>
         <LoadingOverlay visible={loadingOverlayVisible} overlayProps={{ blur: 2 }} />
         {applicationSuccessfullySubmitted ? (
-          <LegacySuccessfulSubmission
-            title='Your application was successfully submitted!'
-            text='We will contact you as soon as we have reviewed your application.'
-          />
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
+              height: '100vh',
+            }}
+          >
+            <Card withBorder p='xl'>
+              <Title order={5}>Your application was successfully submitted!</Title>
+              <Text c='dimmed'>
+                We will contact you as soon as we have reviewed your application.
+              </Text>
+            </Card>
+          </div>
         ) : (
           <Stack>
             <Center>
@@ -187,6 +200,7 @@ const LegacySubmitApplicationPage = () => {
                     interests: values.interests!,
                     projects: values.projects!,
                     thesisTitle: values.thesisTitle!,
+                    thesisType: values.thesisType!,
                     desiredStartDate: values.desiredStartDate!,
                   }
 
@@ -366,20 +380,35 @@ const LegacySubmitApplicationPage = () => {
                     />
                   </Grid.Col>
                 </Grid>
-                <Stack gap='0'>
-                  <TextInput
-                    label='Thesis Title Suggestion'
-                    placeholder='Thesis Title Suggestion'
-                    required={true}
-                    {...form.getInputProps('thesisTitle')}
-                  />
-                  {!form.errors.thesisTitle && (
-                    <Text
-                      fz='xs'
-                      ta='right'
-                    >{`${form.values.thesisTitle?.length ?? 0} / 200`}</Text>
-                  )}
-                </Stack>
+                <Grid>
+                  <Grid.Col span={{ md: 8 }}>
+                    <Stack gap='0'>
+                      <TextInput
+                        label='Thesis Title Suggestion'
+                        placeholder='Thesis Title Suggestion'
+                        required={true}
+                        {...form.getInputProps('thesisTitle')}
+                      />
+                      {!form.errors.thesisTitle && (
+                        <Text
+                          fz='xs'
+                          ta='right'
+                        >{`${form.values.thesisTitle?.length ?? 0} / 200`}</Text>
+                      )}
+                    </Stack>
+                  </Grid.Col>
+                  <Grid.Col span={{ md: 4 }}>
+                    <Select
+                      label='Thesis Type'
+                      required={true}
+                      data={Object.keys(GLOBAL_CONFIG.thesis_types).map((thesisType) => ({
+                        label: GLOBAL_CONFIG.thesis_types[thesisType],
+                        value: thesisType,
+                      }))}
+                      {...form.getInputProps('thesisType')}
+                    />
+                  </Grid.Col>
+                </Grid>
                 <DatePickerInput
                   leftSection={<Calendar />}
                   label='Desired Thesis Start Date'
diff --git a/client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx b/client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx
deleted file mode 100644
index 169f105e..00000000
--- a/client/src/pages/LegacySubmitApplicationPage/components/LegacySuccessfulSubmission/LegacySuccessfulSubmission.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Card, Text, Title } from '@mantine/core'
-
-interface ApplicationSuccessfulSubmissionProps {
-  title: string
-  text: string
-}
-
-export const LegacySuccessfulSubmission = ({
-  title,
-  text,
-}: ApplicationSuccessfulSubmissionProps) => {
-  return (
-    <div
-      style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}
-    >
-      <Card withBorder p='xl'>
-        <Title order={5}>{title}</Title>
-        <Text c='dimmed'>{text}</Text>
-      </Card>
-    </div>
-  )
-}
diff --git a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
index 082fcae6..16c95e00 100644
--- a/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
+++ b/client/src/pages/ManageTopicsPage/components/ReplaceTopicModal/ReplaceTopicModal.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal, Select, Stack, TextInput } from '@mantine/core'
+import { Button, Modal, MultiSelect, Select, Stack, TextInput } from '@mantine/core'
 import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
 import { isNotEmptyUserList } from '../../../../utils/validation'
@@ -27,14 +27,14 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
     problemStatement: string
     goals: string
     references: string
-    type: string | null
+    thesisTypes: string[]
     supervisorIds: string[]
     advisorIds: string[]
   }>({
     mode: 'controlled',
     initialValues: {
       title: '',
-      type: '',
+      thesisTypes: [],
       problemStatement: '',
       goals: '',
       references: '',
@@ -56,7 +56,7 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
     if (opened && topic) {
       form.setInitialValues({
         title: topic.title,
-        type: topic.type || '',
+        thesisTypes: topic.thesisTypes || [],
         problemStatement: topic.problemStatement,
         goals: topic.goals,
         references: topic.references,
@@ -77,7 +77,7 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
         requiresAuth: true,
         data: {
           title: form.values.title,
-          type: form.values.type || null,
+          thesisTypes: form.values.thesisTypes.length > 0 ? form.values.thesisTypes : null,
           problemStatement: form.values.problemStatement,
           goals: form.values.goals,
           references: form.values.references,
@@ -114,17 +114,14 @@ const ReplaceTopicModal = (props: ICreateTopicModalProps) => {
       <form onSubmit={form.onSubmit(onSubmit)}>
         <Stack gap='md'>
           <TextInput label='Title' required {...form.getInputProps('title')} />
-          <Select
-            label='Type'
-            required
-            data={[
-              { value: '', label: 'Any' },
-              ...Object.entries(GLOBAL_CONFIG.thesis_types).map(([key, value]) => ({
-                value: key,
-                label: value,
-              })),
-            ]}
-            {...form.getInputProps('type')}
+          <MultiSelect
+            label='Thesis Types'
+            placeholder={form.values.thesisTypes.length > 0 ? undefined : 'All Thesis Types'}
+            data={Object.entries(GLOBAL_CONFIG.thesis_types).map(([key, value]) => ({
+              value: key,
+              label: value,
+            }))}
+            {...form.getInputProps('thesisTypes')}
           />
           <UserMultiSelect
             label='Supervisor'
diff --git a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx b/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
index d86c6af6..7716a347 100644
--- a/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
+++ b/client/src/pages/SubmitApplicationPage/components/MotivationStep/MotivationStep.tsx
@@ -1,6 +1,6 @@
 import { ITopic } from '../../../../requests/responses/topic'
 import { isNotEmpty, useForm } from '@mantine/form'
-import { Accordion, Button, Stack, TextInput } from '@mantine/core'
+import { Accordion, Button, MultiSelect, Select, Stack, TextInput } from '@mantine/core'
 import DocumentEditor from '../../../../components/DocumentEditor/DocumentEditor'
 import TopicData from '../../../../components/TopicData/TopicData'
 import { useState } from 'react'
@@ -9,6 +9,7 @@ import { showSimpleError } from '../../../../utils/notification'
 import { getApiResponseErrorMessage } from '../../../../requests/handler'
 import { DateInput, DateValue } from '@mantine/dates'
 import { getHtmlTextLength } from '../../../../utils/validation'
+import { GLOBAL_CONFIG } from '../../../../config/global'
 
 interface IMotivationStepProps {
   topic: ITopic | undefined
@@ -17,6 +18,7 @@ interface IMotivationStepProps {
 
 interface IMotivationStepForm {
   thesisTitle: string
+  thesisType: string | null
   desiredStartDate: DateValue
   motivation: string
 }
@@ -31,6 +33,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
     mode: 'controlled',
     initialValues: {
       thesisTitle: '',
+      thesisType: null,
       desiredStartDate: new Date(),
       motivation: '',
     },
@@ -41,6 +44,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
           return 'Please state your suggested thesis title'
         }
       },
+      thesisType: isNotEmpty('Please state your thesis type'),
       desiredStartDate: isNotEmpty('Please state your desired start date'),
       motivation: (value) => {
         if (!value) {
@@ -62,6 +66,7 @@ const MotivationStep = (props: IMotivationStepProps) => {
         data: {
           topicId: topic?.topicId,
           thesisTitle: values.thesisTitle || null,
+          thesisType: values.thesisType,
           desiredStartDate: values.desiredStartDate,
           motivation: values.motivation,
         },
@@ -100,6 +105,17 @@ const MotivationStep = (props: IMotivationStepProps) => {
             {...form.getInputProps('thesisTitle')}
           />
         )}
+        <Select
+          label='Thesis Type'
+          required={true}
+          data={(topic?.thesisTypes || Object.keys(GLOBAL_CONFIG.thesis_types)).map(
+            (thesisType) => ({
+              label: GLOBAL_CONFIG.thesis_types[thesisType] ?? thesisType,
+              value: thesisType,
+            }),
+          )}
+          {...form.getInputProps('thesisType')}
+        />
         <DateInput
           label='Desired Start Date'
           required={true}
diff --git a/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx b/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
index 87f0b9e7..dacadf1f 100644
--- a/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisAssessmentSection/components/SubmitAssessmentModal/SubmitAssessmentModal.tsx
@@ -50,30 +50,27 @@ const SubmitAssessmentModal = (props: ISubmitAssessmentModalProps) => {
   return (
     <Modal opened={opened} onClose={onClose} size='xl' title='Submit Assessment'>
       <Stack gap='md'>
-        <Stack gap={0}>
-          <InputLabel required>Summary</InputLabel>
-          <DocumentEditor
-            value={summary}
-            editMode={true}
-            onChange={(e) => setSummary(e.target.value)}
-          />
-        </Stack>
-        <Stack gap={0}>
-          <InputLabel required>Positives</InputLabel>
-          <DocumentEditor
-            value={positives}
-            editMode={true}
-            onChange={(e) => setPositives(e.target.value)}
-          />
-        </Stack>
-        <Stack gap={0}>
-          <InputLabel required>Negatives</InputLabel>
-          <DocumentEditor
-            value={negatives}
-            editMode={true}
-            onChange={(e) => setNegatives(e.target.value)}
-          />
-        </Stack>
+        <DocumentEditor
+          required
+          label='Summary'
+          value={summary}
+          editMode={true}
+          onChange={(e) => setSummary(e.target.value)}
+        />
+        <DocumentEditor
+          required
+          label='Positives'
+          value={positives}
+          editMode={true}
+          onChange={(e) => setPositives(e.target.value)}
+        />
+        <DocumentEditor
+          required
+          label='Negatives'
+          value={negatives}
+          editMode={true}
+          onChange={(e) => setNegatives(e.target.value)}
+        />
         <TextInput
           label='Grade Suggestion'
           required
diff --git a/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx b/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
index eda61be1..e19a92ad 100644
--- a/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisCommentsList/ThesisCommentsList.tsx
@@ -6,6 +6,7 @@ import {
   Group,
   Modal,
   Pagination,
+  Paper,
   Skeleton,
   Stack,
   Text,
@@ -16,6 +17,7 @@ import AuthenticatedFilePreview from '../../../../components/AuthenticatedFilePr
 import { useLoggedInUser } from '../../../../hooks/authentication'
 import { formatDate, formatUser } from '../../../../utils/format'
 import { Download } from 'phosphor-react'
+import { useHighlightedBackgroundColor } from '../../../../hooks/theme'
 
 const ThesisCommentsList = () => {
   const { thesis, comments, deleteComment, limit, page, setPage } = useThesisCommentsContext()
@@ -24,6 +26,8 @@ const ThesisCommentsList = () => {
 
   const [openedComment, setOpenedComment] = useState<IThesisComment>()
 
+  const commentBackgroundColor = useHighlightedBackgroundColor(false)
+
   return (
     <Stack>
       <Modal opened={!!openedComment} onClose={() => setOpenedComment(undefined)} size='xl'>
@@ -41,7 +45,7 @@ const ThesisCommentsList = () => {
       {comments &&
         comments.content.map((comment) => (
           <Stack gap={0} key={comment.commentId}>
-            <Card p='md' radius='sm'>
+            <Paper p='md' radius='sm' style={{ backgroundColor: commentBackgroundColor }}>
               <Group style={{ width: '100%' }}>
                 <Text>{comment.message}</Text>
                 {comment.hasFile && (
@@ -50,7 +54,7 @@ const ThesisCommentsList = () => {
                   </Button>
                 )}
               </Group>
-            </Card>
+            </Paper>
             <Group ml='auto'>
               <Text size='xs' c='dimmed'>
                 {formatDate(comment.createdAt)}
diff --git a/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx b/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx
index 4628bf41..4bbb28e2 100644
--- a/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisConfigSection/ThesisConfigSection.tsx
@@ -15,6 +15,7 @@ import {
 import { GLOBAL_CONFIG } from '../../../../config/global'
 import { ApiError } from '../../../../requests/handler'
 import ThesisStateBadge from '../../../../components/ThesisStateBadge/ThesisStateBadge'
+import ThesisVisibilitySelect from '../ThesisVisibilitySelect/ThesisVisibilitySelect'
 
 interface IThesisConfigSectionFormValues {
   title: string
@@ -193,15 +194,10 @@ const ThesisConfigSection = () => {
                 }))}
                 {...form.getInputProps('type')}
               />
-              <Select
+              <ThesisVisibilitySelect
                 label='Visibility'
                 required={true}
                 disabled={!access.advisor}
-                data={[
-                  { value: 'PUBLIC', label: 'Public' },
-                  { value: 'INTERNAL', label: 'Internal' },
-                  { value: 'PRIVATE', label: 'Private' },
-                ]}
                 {...form.getInputProps('visibility')}
               />
               <TagsInput
diff --git a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx
index 1836039c..210d37c6 100644
--- a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/ThesisFinalGradeSection.tsx
@@ -48,7 +48,7 @@ const ThesisFinalGradeSection = () => {
               <Stack>
                 <Title order={3}>Final Grade</Title>
                 <Text>{thesis.grade.finalGrade}</Text>
-                <Title order={3}>Feedback</Title>
+                <Title order={3}>Feedback (Visible to Student)</Title>
                 <DocumentEditor value={thesis.grade.feedback} />
               </Stack>
             ) : (
diff --git a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
index 4092bcf6..3c52068a 100644
--- a/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisFinalGradeSection/components/SubmitFinalGradeModal/SubmitFinalGradeModal.tsx
@@ -1,13 +1,14 @@
 import { IThesis } from '../../../../../../requests/responses/thesis'
 import { Button, Checkbox, InputLabel, Modal, Stack, TextInput } from '@mantine/core'
 import { doRequest } from '../../../../../../requests/request'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import DocumentEditor from '../../../../../../components/DocumentEditor/DocumentEditor'
 import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../../../contexts/ThesisProvider/hooks'
 import { ApiError } from '../../../../../../requests/handler'
+import ThesisVisibilitySelect from '../../../ThesisVisibilitySelect/ThesisVisibilitySelect'
 
 interface ISubmitFinalGradeModalProps {
   opened: boolean
@@ -21,7 +22,11 @@ const SubmitFinalGradeModal = (props: ISubmitFinalGradeModalProps) => {
 
   const [finalGrade, setFinalGrade] = useState('')
   const [feedback, setFeedback] = useState('')
-  const [publishThesis, setPublishThesis] = useState(false)
+  const [visibility, setVisibility] = useState(thesis.visibility)
+
+  useEffect(() => {
+    setVisibility(visibility)
+  }, [thesis.visibility])
 
   const isEmpty = !finalGrade || !feedback
 
@@ -32,7 +37,7 @@ const SubmitFinalGradeModal = (props: ISubmitFinalGradeModalProps) => {
       data: {
         finalGrade,
         finalFeedback: feedback,
-        visibility: publishThesis ? 'PUBLIC' : thesis.visibility,
+        visibility: visibility,
       },
     })
 
@@ -48,23 +53,25 @@ const SubmitFinalGradeModal = (props: ISubmitFinalGradeModalProps) => {
   return (
     <Modal opened={opened} onClose={onClose} size='xl' title='Submit Final Grade'>
       <Stack gap='md'>
+        <ThesisVisibilitySelect
+          required
+          label='Thesis Visibility'
+          value={visibility}
+          onChange={(e) => e && setVisibility(e)}
+        />
         <TextInput
           required
           label='Final Grade'
           value={finalGrade}
           onChange={(e) => setFinalGrade(e.target.value)}
         />
-        <InputLabel required>Feedback</InputLabel>
         <DocumentEditor
+          required
+          label='Feedback (Visible to student)'
           value={feedback}
           onChange={(e) => setFeedback(e.target.value)}
           editMode={true}
         />
-        <Checkbox
-          label='Publish Thesis'
-          checked={publishThesis}
-          onChange={(e) => setPublishThesis(e.target.checked)}
-        />
         <Button loading={submitting} onClick={onGradeSubmit} disabled={isEmpty}>
           Submit Grade
         </Button>
diff --git a/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx b/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
index 818da8b4..f87e4da7 100644
--- a/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisInfoSection/ThesisInfoSection.tsx
@@ -7,7 +7,7 @@ import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../contexts/ThesisProvider/hooks'
-import { useNavigate } from 'react-router-dom'
+import { Link, useNavigate } from 'react-router-dom'
 import { ApiError } from '../../../../requests/handler'
 
 const ThesisInfoSection = () => {
@@ -68,19 +68,18 @@ const ThesisInfoSection = () => {
               onChange={(e) => setInfoText(e.target.value)}
             />
             <Grid>
-              <Grid.Col>
+              <Grid.Col span={{ md: 6 }}>
                 {access.advisor && thesis.applicationId && (
                   <Button
+                    component={Link}
                     variant='outline'
-                    onClick={() =>
-                      navigate(`/management/thesis-applications/${thesis.applicationId}`)
-                    }
+                    to={`/applications/${thesis.applicationId}`}
                   >
                     View Student Application
                   </Button>
                 )}
               </Grid.Col>
-              <Grid.Col>
+              <Grid.Col span={{ md: 6 }}>
                 <Flex justify='flex-end'>
                   {access.student && !editMode && (
                     <Button ml='auto' onClick={() => setEditMode(true)}>
diff --git a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
index 85c5b32c..5d77a416 100644
--- a/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisProposalSection/ThesisProposalSection.tsx
@@ -1,6 +1,6 @@
 import { IThesis, ThesisState } from '../../../../requests/responses/thesis'
 import { useState } from 'react'
-import { Accordion, Button, Grid, Group, Stack, Text } from '@mantine/core'
+import { Accordion, Button, Divider, Grid, Group, Stack, Text } from '@mantine/core'
 import UploadFileModal from '../../../../components/UploadFileModal/UploadFileModal'
 import { doRequest } from '../../../../requests/request'
 import { showSimpleError, showSimpleSuccess } from '../../../../utils/notification'
@@ -105,6 +105,9 @@ const ThesisProposalSection = () => {
                         }
                       />
                     </Grid.Col>
+                    <Grid.Col span={12}>
+                      <Divider />
+                    </Grid.Col>
                   </Grid>
                 ))}
               </Stack>
@@ -147,7 +150,7 @@ const ThesisProposalSection = () => {
               )}
               {access.student && thesis.state === ThesisState.WRITING && (
                 <Button ml='auto' onClick={() => setUploadModal(true)}>
-                  Upload New Proposal (Needs Approval)
+                  Upload New Proposal (Needs Re-Approval)
                 </Button>
               )}
             </Group>
diff --git a/client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx b/client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx
new file mode 100644
index 00000000..6e9e43d3
--- /dev/null
+++ b/client/src/pages/ThesisPage/components/ThesisVisibilitySelect/ThesisVisibilitySelect.tsx
@@ -0,0 +1,35 @@
+import { Select, SelectProps, Text } from '@mantine/core'
+
+const ThesisVisibilitySelect = (props: SelectProps) => {
+  const { ...others } = props
+
+  const descriptions: Record<string, string> = {
+    PUBLIC:
+      'Everyone can see the thesis. If thesis is completed, it will be publicly available on the landing page',
+    STUDENT: 'All students that are currently writing a thesis can see the thesis',
+    INTERNAL: 'All advisors and supervisors of the chair can see the thesis',
+    PRIVATE: 'Only assigned users can see the thesis',
+  }
+
+  return (
+    <Select
+      {...others}
+      renderOption={({ option }) => (
+        <div>
+          <Text size='sm'>{option.label || option.value}</Text>
+          <Text size='xs' c='dimmed'>
+            {descriptions[option.value]}
+          </Text>
+        </div>
+      )}
+      data={[
+        { value: 'PUBLIC', label: 'Public' },
+        { value: 'STUDENT', label: 'Thesis Students' },
+        { value: 'INTERNAL', label: 'Internal' },
+        { value: 'PRIVATE', label: 'Private' },
+      ]}
+    />
+  )
+}
+
+export default ThesisVisibilitySelect
diff --git a/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx b/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
index 28ed6ddf..224c4968 100644
--- a/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
+++ b/client/src/pages/ThesisPage/components/ThesisWritingSection/ThesisWritingSection.tsx
@@ -155,13 +155,6 @@ const ThesisWritingSection = () => {
                 )}
               </Grid.Col>
             </Grid>
-            <Divider />
-            <Stack>
-              <ThesisCommentsProvider thesis={thesis} commentType='THESIS'>
-                <ThesisCommentsList />
-                {access.student && <ThesisCommentsForm />}
-              </ThesisCommentsProvider>
-            </Stack>
             <Group grow>
               {access.student &&
                 thesis.state === ThesisState.WRITING &&
@@ -181,6 +174,13 @@ const ThesisWritingSection = () => {
                   </Stack>
                 )}
             </Group>
+            <Divider />
+            <Stack>
+              <ThesisCommentsProvider thesis={thesis} commentType='THESIS'>
+                <ThesisCommentsList />
+                {access.student && <ThesisCommentsForm />}
+              </ThesisCommentsProvider>
+            </Stack>
             <Stack>
               <Divider />
               <CreatePresentationModal
diff --git a/client/src/requests/payloads/application.ts b/client/src/requests/payloads/application.ts
index c3ffd193..9f3547db 100644
--- a/client/src/requests/payloads/application.ts
+++ b/client/src/requests/payloads/application.ts
@@ -4,5 +4,6 @@ export interface ILegacyCreateApplicationPayload extends IUpdateUserInformationP
   universityId: string
   motivation: string
   thesisTitle: string
+  thesisType: string | null
   desiredStartDate: Date
 }
diff --git a/client/src/requests/responses/application.ts b/client/src/requests/responses/application.ts
index bf57840d..23b672e3 100644
--- a/client/src/requests/responses/application.ts
+++ b/client/src/requests/responses/application.ts
@@ -12,10 +12,11 @@ export interface IApplication {
   user: IUser
   topic: ITopic | null
   thesisTitle: string | null
+  thesisType: string | null
   motivation: string
   state: ApplicationState
   desiredStartDate: string
-  comment: string | null
+  comment: string
   createdAt: string
   reviewedBy: ILightUser | null
   reviewedAt: string
diff --git a/client/src/requests/responses/topic.ts b/client/src/requests/responses/topic.ts
index c490f459..5f421273 100644
--- a/client/src/requests/responses/topic.ts
+++ b/client/src/requests/responses/topic.ts
@@ -3,7 +3,7 @@ import { ILightUser } from './user'
 export interface ITopic {
   topicId: string
   title: string
-  type: string | null
+  thesisTypes: string[] | null
   problemStatement: string
   goals: string
   references: string
diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java b/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java
index 75b2c0b3..6e39b9be 100644
--- a/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java
+++ b/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java
@@ -8,6 +8,7 @@
 public enum ThesisVisibility {
     PRIVATE("PRIVATE"),
     INTERNAL("INTERNAL"),
+    STUDENT("STUDENT"),
     PUBLIC("PUBLIC");
 
     private final String value;
diff --git a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
index e89bb550..e8f75cf9 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java
@@ -55,6 +55,7 @@ public ResponseEntity<ApplicationDto> createApplication(
                 authenticatedUser,
                 payload.topicId(),
                 RequestValidator.validateStringMaxLengthAllowNull(payload.thesisTitle(), StringLimits.THESIS_TITLE.getLimit()),
+                RequestValidator.validateStringMaxLength(payload.thesisType(), StringLimits.THESIS_TITLE.getLimit()),
                 RequestValidator.validateNotNull(payload.desiredStartDate()),
                 RequestValidator.validateStringMaxLength(payload.motivation(), StringLimits.LONGTEXT.getLimit())
         );
diff --git a/server/src/main/java/thesistrack/ls1/controller/DashboardController.java b/server/src/main/java/thesistrack/ls1/controller/DashboardController.java
index 992c45fd..b7406882 100644
--- a/server/src/main/java/thesistrack/ls1/controller/DashboardController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/DashboardController.java
@@ -2,28 +2,59 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
-import thesistrack.ls1.dto.DashboardDto;
+import thesistrack.ls1.dto.PaginationDto;
+import thesistrack.ls1.dto.PublishedPresentationDto;
+import thesistrack.ls1.dto.TaskDto;
+import thesistrack.ls1.entity.ThesisPresentation;
+import thesistrack.ls1.entity.User;
+import thesistrack.ls1.service.AuthenticationService;
 import thesistrack.ls1.service.DashboardService;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequestMapping("/v2/dashboard")
 public class DashboardController {
     private final DashboardService dashboardService;
+    private final AuthenticationService authenticationService;
 
     @Autowired
-    public DashboardController(DashboardService dashboardService) {
+    public DashboardController(DashboardService dashboardService, AuthenticationService authenticationService) {
         this.dashboardService = dashboardService;
+        this.authenticationService = authenticationService;
     }
 
-    @GetMapping
-    public ResponseEntity<DashboardDto> getDashboard() {
-        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "This feature is not implemented yet");
+    @GetMapping("/tasks")
+    public ResponseEntity<List<TaskDto>> getTasks(JwtAuthenticationToken jwt) {
+        User authenticatedUser = authenticationService.getAuthenticatedUser(jwt);
+
+        return ResponseEntity.ok(dashboardService.getTasks(authenticatedUser));
+    }
+
+    @GetMapping("/presentations")
+    public ResponseEntity<PaginationDto<PublishedPresentationDto>> getPresentations(
+            @RequestParam(required = false, defaultValue = "0") Integer page,
+            @RequestParam(required = false, defaultValue = "50") Integer limit,
+            @RequestParam(required = false, defaultValue = "scheduledAt") String sortBy,
+            @RequestParam(required = false, defaultValue = "asc") String sortOrder
+    ) {
+        Page<ThesisPresentation> presentations = dashboardService.getPresentations(
+                page,
+                limit,
+                sortBy,
+                sortOrder
+        );
+
+        return ResponseEntity.ok(PaginationDto.fromSpringPage(
+                presentations.map(PublishedPresentationDto::fromPresentationEntity)
+        ));
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java b/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
index 6039ff39..addec347 100644
--- a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java
@@ -63,7 +63,7 @@ public ResponseEntity<Resource> getThesisFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=thesis_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=thesis_%s.pdf", thesisId))
                 .body(thesisService.getThesisFile(thesis));
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
index 3d7012b5..44a5a5e5 100644
--- a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/ThesisController.java
@@ -65,6 +65,7 @@ public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
         UUID userId = authenticatedUser.getId();
         Set<ThesisVisibility> visibilities = Set.of(
                 ThesisVisibility.PUBLIC,
+                ThesisVisibility.STUDENT,
                 ThesisVisibility.INTERNAL,
                 ThesisVisibility.PRIVATE
         );
@@ -75,7 +76,10 @@ public ResponseEntity<PaginationDto<ThesisDto>> getTheses(
                 visibilities = null;
             } else if (authenticatedUser.hasAnyGroup("advisor", "supervisor")) {
                 userId = null;
-                visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.INTERNAL);
+                visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.STUDENT, ThesisVisibility.INTERNAL);
+            } else if (authenticatedUser.hasAnyGroup("student")) {
+                userId = null;
+                visibilities = Set.of(ThesisVisibility.PUBLIC, ThesisVisibility.STUDENT);
             }
         }
 
@@ -213,7 +217,7 @@ public ResponseEntity<Resource> getProposalFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=proposal_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=proposal_%s.pdf", thesisId))
                 .body(thesisService.getProposalFile(thesis));
     }
 
@@ -285,7 +289,7 @@ public ResponseEntity<Resource> getPresentationFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=presentation_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=presentation_%s.pdf", thesisId))
                 .body(thesisService.getPresentationFile(thesis));
     }
 
@@ -321,7 +325,7 @@ public ResponseEntity<Resource> getThesisFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=thesis_%s.pdf", thesisId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=thesis_%s.pdf", thesisId))
                 .body(thesisService.getThesisFile(thesis));
     }
 
@@ -459,7 +463,7 @@ public ResponseEntity<Resource> getCommentFile(
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=comment_%s.pdf", commentId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=comment_%s.pdf", commentId))
                 .body(thesisCommentService.getCommentFile(comment));
     }
 
diff --git a/server/src/main/java/thesistrack/ls1/controller/TopicController.java b/server/src/main/java/thesistrack/ls1/controller/TopicController.java
index e9426852..181342a6 100644
--- a/server/src/main/java/thesistrack/ls1/controller/TopicController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/TopicController.java
@@ -74,7 +74,7 @@ public ResponseEntity<TopicDto> createTopic(
         Topic topic = topicService.createTopic(
                 authenticatedUser,
                 RequestValidator.validateStringMaxLength(payload.title(), StringLimits.THESIS_TITLE.getLimit()),
-                RequestValidator.validateStringMaxLengthAllowNull(payload.type(), StringLimits.SHORTTEXT.getLimit()),
+                RequestValidator.validateStringSetItemMaxLengthAllowNull(payload.thesisTypes(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.problemStatement(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.goals(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.references(), StringLimits.LONGTEXT.getLimit()),
@@ -99,7 +99,7 @@ public ResponseEntity<TopicDto> updateTopic(
                 authenticatedUser,
                 topic,
                 RequestValidator.validateStringMaxLength(payload.title(), StringLimits.THESIS_TITLE.getLimit()),
-                RequestValidator.validateStringMaxLengthAllowNull(payload.type(), StringLimits.SHORTTEXT.getLimit()),
+                RequestValidator.validateStringSetItemMaxLengthAllowNull(payload.thesisTypes(), StringLimits.SHORTTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.problemStatement(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.goals(), StringLimits.LONGTEXT.getLimit()),
                 RequestValidator.validateStringMaxLength(payload.references(), StringLimits.LONGTEXT.getLimit()),
diff --git a/server/src/main/java/thesistrack/ls1/controller/UserController.java b/server/src/main/java/thesistrack/ls1/controller/UserController.java
index 0c25dd19..264270c0 100644
--- a/server/src/main/java/thesistrack/ls1/controller/UserController.java
+++ b/server/src/main/java/thesistrack/ls1/controller/UserController.java
@@ -58,7 +58,7 @@ public ResponseEntity<Resource> getExaminationReport(@PathVariable UUID userId,
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=examination_report_%s.pdf", userId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=examination_report_%s.pdf", userId))
                 .body(userService.getExaminationReport(user));
     }
 
@@ -73,7 +73,7 @@ public ResponseEntity<Resource> getCV(@PathVariable UUID userId, JwtAuthenticati
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=cv_%s.pdf", userId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=cv_%s.pdf", userId))
                 .body(userService.getCV(user));
     }
 
@@ -88,7 +88,7 @@ public ResponseEntity<Resource> getDegreeReport(@PathVariable UUID userId, JwtAu
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
-                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=degree_report_%s.pdf", userId))
+                .header(HttpHeaders.CONTENT_DISPOSITION, String.format("inline; filename=degree_report_%s.pdf", userId))
                 .body(userService.getDegreeReport(user));
     }
 }
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java
index 77a27591..08db452d 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java
@@ -6,6 +6,7 @@
 public record CreateApplicationPayload (
         UUID topicId,
         String thesisTitle,
+        String thesisType,
         Instant desiredStartDate,
         String motivation
 ) {
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
index 0b7cdf8c..419b5fc9 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/LegacyCreateApplicationPayload.java
@@ -20,6 +20,7 @@ public record LegacyCreateApplicationPayload (
         String interests,
         String projects,
         String thesisTitle,
+        String thesisType,
         Instant desiredStartDate
 ) {
 
diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
index 9dc436dd..1781d367 100644
--- a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
+++ b/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java
@@ -5,7 +5,7 @@
 
 public record ReplaceTopicPayload(
         String title,
-        String type,
+        Set<String> thesisTypes,
         String problemStatement,
         String goals,
         String references,
diff --git a/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java b/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java
index 5327929d..d9ad37b1 100644
--- a/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java
@@ -11,6 +11,7 @@ public record ApplicationDto (
     UserDto user,
     TopicDto topic,
     String thesisTitle,
+    String thesisType,
     String motivation,
     ApplicationState state,
     Instant desiredStartDate,
@@ -29,6 +30,7 @@ public static ApplicationDto fromApplicationEntity(Application application, bool
                 UserDto.fromUserEntity(application.getUser()),
                 TopicDto.fromTopicEntity(application.getTopic()),
                 application.getThesisTitle(),
+                application.getThesisType(),
                 application.getMotivation(),
                 application.getState(),
                 application.getDesiredStartDate(), protectedData ? application.getComment() : null,
diff --git a/server/src/main/java/thesistrack/ls1/dto/DashboardDto.java b/server/src/main/java/thesistrack/ls1/dto/DashboardDto.java
deleted file mode 100644
index 0dda73a8..00000000
--- a/server/src/main/java/thesistrack/ls1/dto/DashboardDto.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package thesistrack.ls1.dto;
-
-public record DashboardDto () {
-}
diff --git a/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java b/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
new file mode 100644
index 00000000..88b5517e
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java
@@ -0,0 +1,31 @@
+package thesistrack.ls1.dto;
+
+import thesistrack.ls1.constants.ThesisPresentationType;
+import thesistrack.ls1.entity.ThesisPresentation;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public record PublishedPresentationDto (
+        UUID presentationId,
+        ThesisPresentationType type,
+        String location,
+        String streamUrl,
+        Instant scheduledAt,
+        PublishedThesisDto thesis
+) {
+    public static PublishedPresentationDto fromPresentationEntity(ThesisPresentation presentation) {
+        if (presentation == null) {
+            return null;
+        }
+
+        return new PublishedPresentationDto(
+                presentation.getId(),
+                presentation.getType(),
+                presentation.getLocation(),
+                presentation.getStreamUrl(),
+                presentation.getScheduledAt(),
+                PublishedThesisDto.fromThesisEntity(presentation.getThesis())
+        );
+    }
+}
diff --git a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
new file mode 100644
index 00000000..84ad3f52
--- /dev/null
+++ b/server/src/main/java/thesistrack/ls1/dto/TaskDto.java
@@ -0,0 +1,10 @@
+package thesistrack.ls1.dto;
+
+import java.time.Instant;
+
+public record TaskDto(
+        String message,
+        Instant startDate,
+        Instant endDate,
+        Number priority
+) { }
diff --git a/server/src/main/java/thesistrack/ls1/dto/TopicDto.java b/server/src/main/java/thesistrack/ls1/dto/TopicDto.java
index 3e3e4d4d..d934eb8e 100644
--- a/server/src/main/java/thesistrack/ls1/dto/TopicDto.java
+++ b/server/src/main/java/thesistrack/ls1/dto/TopicDto.java
@@ -7,12 +7,13 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 
 public record TopicDto (
         UUID topicId,
         String title,
-        String type,
+        Set<String> thesisTypes,
         String problemStatement,
         String goals,
         String references,
@@ -43,7 +44,7 @@ public static TopicDto fromTopicEntity(Topic topic) {
         return new TopicDto(
                 topic.getId(),
                 topic.getTitle(),
-                topic.getType(),
+                topic.getThesisTypes() == null || topic.getThesisTypes().isEmpty() ? null : topic.getThesisTypes(),
                 topic.getProblemStatement(),
                 topic.getGoals(),
                 topic.getReferences(),
diff --git a/server/src/main/java/thesistrack/ls1/entity/Application.java b/server/src/main/java/thesistrack/ls1/entity/Application.java
index 4fc38751..70f2b3f6 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Application.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Application.java
@@ -32,6 +32,9 @@ public class Application {
     @Column(name = "thesis_title")
     private String thesisTitle;
 
+    @Column(name = "thesis_type")
+    private String thesisType;
+
     @NotNull
     @Column(name = "motivation", nullable = false)
     private String motivation;
diff --git a/server/src/main/java/thesistrack/ls1/entity/Thesis.java b/server/src/main/java/thesistrack/ls1/entity/Thesis.java
index 308898c7..669143a3 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Thesis.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Thesis.java
@@ -199,7 +199,7 @@ public boolean hasStudentAccess(User user) {
     }
 
     public boolean hasReadAccess(User user) {
-        if (user == null && visibility == ThesisVisibility.PUBLIC && state == ThesisState.FINISHED) {
+        if (visibility == ThesisVisibility.PUBLIC && state == ThesisState.FINISHED) {
             return true;
         }
 
@@ -219,6 +219,10 @@ public boolean hasReadAccess(User user) {
             return true;
         }
 
+        if (visibility.equals(ThesisVisibility.STUDENT) && user.hasAnyGroup("student", "advisor", "supervisor")) {
+            return true;
+        }
+
         return false;
     }
 }
\ No newline at end of file
diff --git a/server/src/main/java/thesistrack/ls1/entity/Topic.java b/server/src/main/java/thesistrack/ls1/entity/Topic.java
index 974a7f3d..965eb1c3 100644
--- a/server/src/main/java/thesistrack/ls1/entity/Topic.java
+++ b/server/src/main/java/thesistrack/ls1/entity/Topic.java
@@ -5,7 +5,9 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.type.SqlTypes;
 
 import java.time.Instant;
 import java.util.HashSet;
@@ -26,8 +28,9 @@ public class Topic {
     @Column(name = "title", nullable = false)
     private String title;
 
-    @Column(name = "type")
-    private String type;
+    @JdbcTypeCode(SqlTypes.ARRAY)
+    @Column(name = "thesis_types", columnDefinition = "text[]")
+    private Set<String> thesisTypes = new HashSet<>();
 
     @NotNull
     @Column(name = "problem_statement", nullable = false)
diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java b/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
index e792167e..23c8fa8e 100644
--- a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
+++ b/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java
@@ -1,12 +1,18 @@
 package thesistrack.ls1.repository;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import thesistrack.ls1.entity.ThesisPresentation;
 
+import java.time.Instant;
 import java.util.UUID;
 
 @Repository
 public interface ThesisPresentationRepository extends JpaRepository<ThesisPresentation, UUID> {
-
+    @Query("SELECT p FROM ThesisPresentation p WHERE p.scheduledAt >= :time")
+    Page<ThesisPresentation> findFuturePresentations(@Param("time") Instant time, Pageable page);
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
index 437ee277..da023425 100644
--- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ApplicationService.java
@@ -120,6 +120,7 @@ public Application createLegacyApplication(
         application.setUser(userRepository.save(student));
 
         application.setThesisTitle(RequestValidator.validateStringMaxLength(payload.thesisTitle(), 500));
+        application.setThesisType(RequestValidator.validateStringMaxLength(payload.thesisType(), 500));
         application.setMotivation(RequestValidator.validateStringMaxLength(payload.motivation(), 1000));
         application.setComment("");
         application.setState(ApplicationState.NOT_ASSESSED);
@@ -134,12 +135,13 @@ public Application createLegacyApplication(
     }
 
     @Transactional
-    public Application createApplication(User user, UUID topicId, String thesisTitle, Instant desiredStartDate, String motivation) {
+    public Application createApplication(User user, UUID topicId, String thesisTitle, String thesisType, Instant desiredStartDate, String motivation) {
         Application application = new Application();
         application.setUser(user);
 
         application.setTopic(topicId == null ? null : topicService.findById(topicId));
         application.setThesisTitle(thesisTitle);
+        application.setThesisType(thesisType);
         application.setMotivation(motivation);
         application.setComment("");
         application.setState(ApplicationState.NOT_ASSESSED);
diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
index 90a35fac..dc31a542 100644
--- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java
+++ b/server/src/main/java/thesistrack/ls1/service/DashboardService.java
@@ -1,7 +1,51 @@
 package thesistrack.ls1.service;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import thesistrack.ls1.dto.TaskDto;
+import thesistrack.ls1.entity.ThesisPresentation;
+import thesistrack.ls1.entity.User;
+import thesistrack.ls1.repository.ThesisPresentationRepository;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class DashboardService {
+    private final ThesisPresentationRepository thesisPresentationRepository;
+
+    public DashboardService(ThesisPresentationRepository thesisPresentationRepository) {
+        this.thesisPresentationRepository = thesisPresentationRepository;
+    }
+
+    public Page<ThesisPresentation> getPresentations(Integer page, Integer limit, String sortBy, String sortOrder) {
+        Sort.Order order = new Sort.Order(sortOrder.equals("asc") ? Sort.Direction.ASC : Sort.Direction.DESC, sortBy);
+
+        return thesisPresentationRepository.findFuturePresentations(Instant.now(), PageRequest.of(page, limit, Sort.by(order)));
+    }
+
+    public List<TaskDto> getTasks(User user) {
+        List<TaskDto> tasks = new ArrayList<>();
+
+        // proposal task
+
+        // thesis submission task
+
+        // presentation tasks
+
+        // thesis assessment task
+
+        // grade thesis task
+
+        // close thesis task
+
+        // review application task
+
+        // no open topic task
+
+        return tasks;
+    }
 }
diff --git a/server/src/main/java/thesistrack/ls1/service/MailingService.java b/server/src/main/java/thesistrack/ls1/service/MailingService.java
index 07876b37..8f32acb7 100644
--- a/server/src/main/java/thesistrack/ls1/service/MailingService.java
+++ b/server/src/main/java/thesistrack/ls1/service/MailingService.java
@@ -107,6 +107,7 @@ public void sendProposalAcceptedEmail(ThesisProposal proposal) {
                 .addPrimarySender(proposal.getApprovedBy())
                 .sendToThesisStudents(proposal.getThesis())
                 .fillThesisPlaceholders(proposal.getThesis())
+                .fillThesisProposalPlaceholders(proposal)
                 .send(javaMailSender, uploadService);
     }
 
diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
index 92e1ea77..4ff4f5cb 100644
--- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java
+++ b/server/src/main/java/thesistrack/ls1/service/ThesisService.java
@@ -91,7 +91,7 @@ public Thesis createThesis(
 
         thesis.setTitle(thesisTitle);
         thesis.setType(thesisType);
-        thesis.setVisibility(ThesisVisibility.PRIVATE);
+        thesis.setVisibility(ThesisVisibility.INTERNAL);
         thesis.setKeywords(new HashSet<>());
         thesis.setInfo("");
         thesis.setAbstractField("");
diff --git a/server/src/main/java/thesistrack/ls1/service/TopicService.java b/server/src/main/java/thesistrack/ls1/service/TopicService.java
index b545da7f..6346cfb4 100644
--- a/server/src/main/java/thesistrack/ls1/service/TopicService.java
+++ b/server/src/main/java/thesistrack/ls1/service/TopicService.java
@@ -54,7 +54,7 @@ public Page<Topic> getAll(
     public Topic createTopic(
             User creator,
             String title,
-            String type,
+            Set<String> thesisTypes,
             String problemStatement,
             String goals,
             String references,
@@ -64,7 +64,7 @@ public Topic createTopic(
         Topic topic = new Topic();
 
         topic.setTitle(title);
-        topic.setType(type);
+        topic.setThesisTypes(thesisTypes);
         topic.setProblemStatement(problemStatement);
         topic.setGoals(goals);
         topic.setReferences(references);
@@ -84,7 +84,7 @@ public Topic updateTopic(
             User updater,
             Topic topic,
             String title,
-            String type,
+            Set<String> thesisTypes,
             String problemStatement,
             String goals,
             String references,
@@ -92,7 +92,7 @@ public Topic updateTopic(
             Set<UUID> advisorIds
     ) {
         topic.setTitle(title);
-        topic.setType(type);
+        topic.setThesisTypes(thesisTypes);
         topic.setProblemStatement(problemStatement);
         topic.setGoals(goals);
         topic.setReferences(references);
diff --git a/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java b/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java
index e5a18d6a..514ab3b6 100644
--- a/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java
+++ b/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java
@@ -27,6 +27,28 @@ public static String validateStringMaxLengthAllowNull(String value, int maxLengt
         return validateStringMaxLength(value, maxLength);
     }
 
+    public static Set<String> validateStringSetItemMaxLength(Set<String> value, int maxLength) {
+        if (value == null) {
+            throw new ResourceInvalidParametersException("Required set is null");
+        }
+
+        for (String s : value) {
+            if (s.length() > maxLength) {
+                throw new ResourceInvalidParametersException("String exceeds maximum length of " + maxLength + " characters");
+            }
+        }
+
+        return value;
+    }
+
+    public static Set<String> validateStringSetItemMaxLengthAllowNull(Set<String> value, int maxLength) {
+        if (value == null) {
+            return null;
+        }
+
+        return validateStringSetItemMaxLength(value, maxLength);
+    }
+
     public static String validateEmail(String value) {
         if (value == null || value.length() > 200) {
             throw new ResourceInvalidParametersException("Required email is missing");
diff --git a/server/src/main/resources/db/changelog/changes/06_topics.sql b/server/src/main/resources/db/changelog/changes/06_topics.sql
index bd595b45..6119a1b4 100644
--- a/server/src/main/resources/db/changelog/changes/06_topics.sql
+++ b/server/src/main/resources/db/changelog/changes/06_topics.sql
@@ -31,3 +31,8 @@ UPDATE applications SET comment = '' WHERE comment IS NULL;
 ALTER TABLE applications
     ALTER COLUMN comment SET DEFAULT '',
     ALTER COLUMN comment SET NOT NULL;
+
+--changeset emilius:06-topics-6
+ALTER TABLE topics ADD COLUMN thesis_types TEXT[];
+ALTER TABLE topics DROP COLUMN "type";
+ALTER TABLE applications ADD COLUMN thesis_type TEXT;