diff --git a/frontend/frontend/src/components/CourseCard.tsx b/frontend/frontend/src/components/CourseCard.tsx
index 0359ee2c..71f38fae 100644
--- a/frontend/frontend/src/components/CourseCard.tsx
+++ b/frontend/frontend/src/components/CourseCard.tsx
@@ -19,6 +19,9 @@ import { Course, project } from '../pages/mainPage/MainPage.tsx'
 import dayjs from 'dayjs'
 
 import { CourseCardSkeleton } from './CourseCardSkeleton.tsx'
+import { Submission } from '../pages/submissionPage/SubmissionPage.tsx'
+import { Group } from '../pages/groupsPage/GroupsPage.tsx'
+import axios from 'axios'
 /*
  * CourseCard component displays a card with course information and a list of assignments
  * @param courseId: string, the id of the course
@@ -29,6 +32,7 @@ import { CourseCardSkeleton } from './CourseCardSkeleton.tsx'
 //TODO: fix archived with state so that the card moves to ArchivedView when archived
 
 interface CourseCardProps {
+    userid: number
     courseId: string
     archived: boolean
     isStudent: boolean
@@ -38,6 +42,7 @@ interface CourseCardProps {
 }
 
 export function CourseCard({
+    userid,
     courseId,
     archived,
     isStudent,
@@ -49,11 +54,15 @@ export function CourseCard({
     const [course, setCourse] = useState<Course>({
         vak_id: 0,
         naam: '',
+        jaartal: 0,
         studenten: [],
         lesgevers: [],
         gearchiveerd: false,
     })
     const [assignments, setAssignments] = useState<project[]>([])
+    const [groupsWithSubmissions, setGroupsWithSubmissions] = useState<Group[]>(
+        []
+    )
     const [teachers, setTeachers] = useState<
         { first_name: string; last_name: string }[]
     >([])
@@ -77,6 +86,32 @@ export function CourseCard({
                 setCourse(courseResponse.data)
                 setAssignments(assignmentsResponse.data)
 
+                //fetch submissions as well if user is student
+                if (isStudent) {
+                    const groups: Group[] = await instance
+                        .get(`/groepen/?student=${userid}`)
+                        .then((response) => response.data)
+                    const submissionPromises = groups.map(async (group) => {
+                        const response = await instance.get<Submission>(
+                            `/indieningen/?project=${group.project}`
+                        )
+                        return response.data
+                    })
+                    const submissions = await axios.all(submissionPromises)
+
+                    console.log(groups)
+                    const validGroups = groups.filter((group) =>
+                        submissions
+                            .flat(Infinity)
+                            .some(
+                                (submission) =>
+                                    submission.groep === group.groep_id
+                            )
+                    )
+
+                    setGroupsWithSubmissions(validGroups)
+                }
+
                 if (courseResponse.data && courseResponse.data.lesgevers) {
                     const lesgevers = []
                     for (const teacherId of courseResponse.data.lesgevers) {
@@ -198,10 +233,6 @@ export function CourseCard({
                                 </Box>
                                 {/* Number of students enrolled */}
                                 <Box>
-                                    <Typography variant={'subtitle1'}>
-                                        {t('students') + ': '}
-                                        {course.studenten.length || 0}
-                                    </Typography>
                                     <Box
                                         display={'flex'}
                                         flexDirection={'column'}
@@ -227,6 +258,10 @@ export function CourseCard({
                                             )}
                                         </IconButton>
                                     </Box>
+                                    <Typography variant={'subtitle1'}>
+                                        {t('students') + ': '}
+                                        {course.studenten.length || 0}
+                                    </Typography>
                                 </Box>
                             </Box>
                         </CardActionArea>
@@ -340,16 +375,19 @@ export function CourseCard({
                                                             assignment.titel
                                                         }
                                                         dueDate={
-                                                            dayjs(
-                                                                assignment.deadline
-                                                            ).format(
-                                                                'DD/MM/YYYY HH:mm'
-                                                            ) || undefined
+                                                            assignment.deadline
+                                                                ? dayjs(
+                                                                    assignment.deadline
+                                                                  ).format(
+                                                                    'DD/MM/YYYY HH:mm'
+                                                                  )
+                                                                : undefined
                                                         }
-                                                        status={
-                                                            assignment.project_id ===
-                                                            1
-                                                        } //TODO dit moet nog aangepast worden
+                                                        status={groupsWithSubmissions.some(
+                                                            (group) =>
+                                                                group.project ===
+                                                                assignment.project_id
+                                                        )}
                                                         isStudent={isStudent}
                                                     />
                                                 ))}
@@ -378,16 +416,22 @@ export function CourseCard({
                                                                     assignment.titel
                                                                 }
                                                                 dueDate={
-                                                                    dayjs(
-                                                                        assignment.deadline
-                                                                    ).format(
-                                                                        'DD/MM/YYYY HH:mm'
-                                                                    ) ||
-                                                                    undefined
+                                                                    assignment.deadline
+                                                                        ? dayjs(
+                                                                            assignment.deadline
+                                                                          ).format(
+                                                                            'DD/MM/YYYY HH:mm'
+                                                                          )
+                                                                        : undefined
                                                                 }
                                                                 status={
-                                                                    assignment.project_id ===
-                                                                    1
+                                                                    groupsWithSubmissions.some(
+                                                                        (
+                                                                            group
+                                                                        ) =>
+                                                                            group.project ===
+                                                                            assignment.project_id
+                                                                    )
                                                                     //TODO: status has to check if there is already a submission
                                                                 }
                                                                 isStudent={
@@ -429,10 +473,11 @@ export function CourseCard({
                                                                     ) ||
                                                                     undefined
                                                                 }
-                                                                status={
-                                                                    assignment.project_id ===
-                                                                    1
-                                                                }
+                                                                status={groupsWithSubmissions.some(
+                                                                    (group) =>
+                                                                        group.project ===
+                                                                        assignment.project_id
+                                                                )}
                                                                 isStudent={
                                                                     isStudent
                                                                 }
diff --git a/frontend/frontend/src/components/DeadlineCalendar.tsx b/frontend/frontend/src/components/DeadlineCalendar.tsx
index 51c041a8..9835c497 100644
--- a/frontend/frontend/src/components/DeadlineCalendar.tsx
+++ b/frontend/frontend/src/components/DeadlineCalendar.tsx
@@ -7,13 +7,13 @@ import {
 import dayjs, { Dayjs } from 'dayjs'
 import {
     Badge,
-    SxProps,
-    Stack,
-    Typography,
     List,
     ListItem,
     ListItemButton,
     ListItemText,
+    Stack,
+    SxProps,
+    Typography,
 } from '@mui/material'
 import { useEffect, useRef, useState } from 'react'
 import AssignmentIcon from '@mui/icons-material/Assignment'
@@ -125,7 +125,14 @@ function DeadlineMenu({ assignments, selectedDay }: DeadlineMenuProps) {
                         <ListItem>
                             <ListItemButton
                                 sx={{
-                                    border: 1,
+                                    border: 0.5,
+                                    borderColor: 'primary.main',
+                                    textAlign: 'center',
+                                    width: '100%',
+                                    borderRadius: 2,
+                                    '&:hover': {
+                                        backgroundColor: 'primary.light',
+                                    },
                                 }}
                                 onClick={() =>
                                     handleProjectClick(
@@ -134,8 +141,14 @@ function DeadlineMenu({ assignments, selectedDay }: DeadlineMenuProps) {
                                     )
                                 }
                             >
-                                <ListItemText primary={assignment.titel} />
-
+                                <ListItemText sx={{ maxWidth: '100%' }}>
+                                    <Typography
+                                        textOverflow={'ellipsis'}
+                                        color={'text.primary'}
+                                    >
+                                        {assignment.titel}
+                                    </Typography>
+                                </ListItemText>
                             </ListItemButton>
                         </ListItem>
                     ))}
@@ -202,6 +215,12 @@ export function DeadlineCalendar({
         fetchHighlightedDays(date)
     }
 
+    const handleYearChange = (date: Dayjs) => {
+        setIsLoading(true)
+        setHighlightedDays([])
+        fetchHighlightedDays(date)
+    }
+
     return (
         <>
             <Stack direction={'column'}>
@@ -211,6 +230,7 @@ export function DeadlineCalendar({
                     value={value}
                     onChange={(newValue) => setValue(newValue)}
                     onMonthChange={(newValue) => handleMonthChange(newValue)}
+                    onYearChange={(newValue) => handleYearChange(newValue)}
                     renderLoading={() => <DayCalendarSkeleton />}
                     loading={isLoading}
                     sx={dateStyle}
diff --git a/frontend/frontend/src/components/Header.tsx b/frontend/frontend/src/components/Header.tsx
index 0a21c2b3..f8a83cd3 100644
--- a/frontend/frontend/src/components/Header.tsx
+++ b/frontend/frontend/src/components/Header.tsx
@@ -147,7 +147,7 @@ export const Header = ({ variant, title }: Props) => {
                         >
                             {variant === 'main' && (
                                 <Box
-                                    id='logo'
+                                    id="logo"
                                     component="img"
                                     src={'assets/logo_duif_top_wit.png'}
                                     alt="logo_app"
diff --git a/frontend/frontend/src/components/RestrictionCard.tsx b/frontend/frontend/src/components/RestrictionCard.tsx
index cdfa256b..504238c6 100644
--- a/frontend/frontend/src/components/RestrictionCard.tsx
+++ b/frontend/frontend/src/components/RestrictionCard.tsx
@@ -1,7 +1,8 @@
 import { restriction } from '../pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx'
-import { Box, IconButton, Switch, Typography } from '@mui/material'
+import { IconButton, Switch, Typography } from '@mui/material'
 import CloseIcon from '@mui/icons-material/Close'
 import React from 'react'
+import { EvenlySpacedRow } from './CustomComponents.tsx'
 
 interface RestrictionCardProps {
     restriction: restriction
@@ -28,26 +29,22 @@ export function RestrictionCard({
 
     return (
         <>
-            <Box
-                display={'flex'}
-                flexDirection={'row'}
-                width={'100%'}
-                justifyContent={'space-between'}
-            >
-                <Typography id="script" variant={'body2'}>
-                    {restriction.script.replace(/^.*[\\/]/, '')}
-                </Typography>
-                <Switch
-                    id="mustPassSwitch"
-                    value={mustPass}
-                    checked={mustPass}
-                    onChange={() => handleMustPassChange()}
-                />
-
-                <IconButton id="closeButton" onClick={handleRemove}>
-                    <CloseIcon />
-                </IconButton>
-            </Box>
+            <EvenlySpacedRow
+                items={[
+                    <Typography id="script" variant={'body2'}>
+                        {restriction.script.replace(/^.*[\\/]/, '')}
+                    </Typography>,
+                    <Switch
+                        id="mustPassSwitch"
+                        value={mustPass}
+                        checked={mustPass}
+                        onChange={() => handleMustPassChange()}
+                    />,
+                    <IconButton id="closeButton" onClick={handleRemove}>
+                        <CloseIcon />
+                    </IconButton>,
+                ]}
+            />
         </>
     )
 }
diff --git a/frontend/frontend/src/i18n/en.ts b/frontend/frontend/src/i18n/en.ts
index aa4ef3bd..3be359c7 100644
--- a/frontend/frontend/src/i18n/en.ts
+++ b/frontend/frontend/src/i18n/en.ts
@@ -120,6 +120,10 @@ const english = {
     open_with_ui: 'Open with UI',
     choose_existing: 'Choose existing',
     make_new_script: 'Make new script',
+    cant_add_teachers_to_student_list: 'You cannot add teachers to the student list',
+    cant_add_students_to_teacher_list: 'You cannot add students to the teacher list',
+    cant_add_users_twice: 'You cannot add users to a subject twice',
+    this_user_doesnt_exist: 'This user does not exist',
 }
 
 export default english
diff --git a/frontend/frontend/src/i18n/nl.ts b/frontend/frontend/src/i18n/nl.ts
index ea6fe94d..a00800fc 100644
--- a/frontend/frontend/src/i18n/nl.ts
+++ b/frontend/frontend/src/i18n/nl.ts
@@ -116,10 +116,14 @@ const dutch = {
     noGroup: 'Je lijkt nog geen groep te hebben.',
     chooseGroup: 'Kies een groep voor je indient',
     contactTeacher: 'Gelieve contact op te nemen met je lesgever.',
-    group_number: 'GroepsNummer',
+    group_number: 'Groepnummer',
     open_with_ui: 'Open met UI',
     choose_existing: 'Kies een bestaand script',
     make_new_script: 'Maak nieuw script aan',
+    cant_add_teachers_to_student_list: 'Je kan geen leerkrachten aan de studenten lijst toevoegen',
+    cant_add_students_to_teacher_list: 'Je kan geen studenten aan de leerkrachten lijst toevoegen',
+    cant_add_users_twice: 'Je kan gebruikers geen twee keer toevoegen',
+    this_user_doesnt_exist: 'Deze gebruiker bestaat niet',
 }
 
 export default dutch
diff --git a/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx b/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
index 39f49c20..cf9458c3 100644
--- a/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
+++ b/frontend/frontend/src/pages/addChangeAssignmentPage/AddChangeAssignmentPage.tsx
@@ -1,4 +1,4 @@
-import { Card } from '../../components/CustomComponents.tsx'
+import {Card, Divider, EvenlySpacedRow} from '../../components/CustomComponents.tsx'
 import {
     Box,
     CircularProgress,
@@ -95,6 +95,7 @@ export function AddChangeAssignmentPage() {
     const [description, setDescription] = useState('')
     const [dueDate, setDueDate] = useState<Dayjs | null>(null)
     const [extraDueDate, setExtraDueDate] = useState<Dayjs | null>(null)
+    const [oldRestrictions, setOldRestrictions] = useState<restriction[]>([])
     const [restrictions, setRestrictions] = useState<restriction[]>([])
     const [visible, setVisible] = useState(false)
     const [assignmentFile, setAssignmentFile] = useState<File>()
@@ -232,6 +233,7 @@ export function AddChangeAssignmentPage() {
                                 console.error(error)
                             })
                     }
+                    setOldRestrictions(restrictions)
                     setRestrictions(restrictions)
                 })
                 .catch((error) => {
@@ -332,12 +334,23 @@ export function AddChangeAssignmentPage() {
             },
         }
 
+        //delete removed restrictions
+        oldRestrictions.forEach((oldRestriction) => {
+            if (!restrictions.includes(oldRestriction)) {
+                instance
+                    .delete(
+                        '/restricties/' + oldRestriction.restrictie_id + '/'
+                    )
+                    .catch((error) => {
+                        console.error(error)
+                    })
+            }
+        })
+
         restrictions.forEach((restriction) => {
             const formData = new FormData()
             formData.append('project', projectId)
-            if (restriction.file !== undefined) {
-                formData.append('script', restriction.file)
-            }
+
             formData.append('moet_slagen', restriction.moet_slagen.toString())
             if (restriction.restrictie_id !== undefined) {
                 formData.append(
@@ -354,6 +367,9 @@ export function AddChangeAssignmentPage() {
                         console.error(error)
                     })
             } else {
+                if (restriction.file !== undefined) {
+                    formData.append('script', restriction.file)
+                }
                 instance
                     .post('/restricties/', formData, config)
                     .catch((error) => {
@@ -523,7 +539,7 @@ export function AddChangeAssignmentPage() {
                                             ) : (
                                                 <TextField
                                                     type="text"
-                                                    placeholder={'Title'}
+                                                    placeholder={t('name')}
                                                     error={
                                                         assignmentErrors.title
                                                     }
@@ -732,8 +748,8 @@ export function AddChangeAssignmentPage() {
                                     <Card aria-label={'description'}>
                                         <Box
                                             padding={2}
-                                            maxHeight={'20svh'}
-                                            minHeight={'20svh'}
+                                            maxHeight={'18svh'}
+                                            minHeight={'18svh'}
                                         >
                                             <Typography
                                                 variant={'h5'}
@@ -776,7 +792,7 @@ export function AddChangeAssignmentPage() {
                                                     }
                                                     sx={{
                                                         overflowY: 'auto',
-                                                        maxHeight: '25svh',
+                                                        maxHeight: '23svh',
                                                     }}
                                                 />
                                             )}
@@ -788,24 +804,45 @@ export function AddChangeAssignmentPage() {
                                         marginTop={3}
                                         display={'flex'}
                                         flexDirection={'row'}
+                                        alignItems={'flex-end'}
+                                        gap={1}
                                     >
                                         <Card
                                             sx={{
-                                                padding: 1,
                                                 backgroundColor:
                                                     'background.default',
                                                 width: '70%',
                                                 height: '28svh',
                                             }}
                                         >
+                                            <Box
+                                                sx={{
+                                                    backgroundColor: 'secondary.main',
+                                                    height: 48,
+                                                    padding: 1,
+                                                }}
+                                            >
                                             <Typography
                                                 variant={'h5'}
                                                 fontWeight={'bold'}
                                             >
                                                 {t('restrictions')}
                                             </Typography>
-                                            <Box sx={{ padding: 1 }}>
-                                                {/*This list will render the restrictions that are added to the assignment.*/}
+                                            <EvenlySpacedRow items={[
+                                                    <Typography variant="body1" fontWeight={'bold'}>
+                                                        {t('name')}
+                                                    </Typography>,
+                                                    <Typography variant="body1" fontWeight={'bold'}>
+                                                        {t('must_pass')}
+                                                    </Typography>,
+                                                    <Typography variant="body1" fontWeight={'bold'}>
+                                                        {t('remove')}
+                                                    </Typography>]}
+                                            />
+                                            </Box>
+                                            <Divider/>
+                                            {/*This list will render the restrictions that are added to the assignment.*/}
+                                            <Box sx={{marginTop: -1.1}}>
                                                 <List
                                                     sx={{
                                                         maxHeight: '18vh',
@@ -824,23 +861,26 @@ export function AddChangeAssignmentPage() {
                                                                     index
                                                                 ) => {
                                                                     return (
-                                                                        <ListItem
-                                                                            key={
-                                                                                index
-                                                                            }
-                                                                        >
-                                                                            <RestrictionCard
-                                                                                restriction={
-                                                                                    restriction
-                                                                                }
-                                                                                restrictions={
-                                                                                    restrictions
+                                                                        <>
+                                                                            <Divider/>
+                                                                            <ListItem sx={{ maxHeight: '45px'}}
+                                                                                key={
+                                                                                    index
                                                                                 }
-                                                                                setRestrictions={
-                                                                                    setRestrictions
-                                                                                }
-                                                                            />
-                                                                        </ListItem>
+                                                                            >
+                                                                                <RestrictionCard
+                                                                                    restriction={
+                                                                                        restriction
+                                                                                    }
+                                                                                    restrictions={
+                                                                                        restrictions
+                                                                                    }
+                                                                                    setRestrictions={
+                                                                                        setRestrictions
+                                                                                    }
+                                                                                />
+                                                                            </ListItem>
+                                                                        </>
                                                                     )
                                                                 }
                                                             )}
@@ -848,34 +888,35 @@ export function AddChangeAssignmentPage() {
                                                     )}
                                                 </List>
                                             </Box>
-                                            <Box
-                                                width={'100%'}
-                                                display={'flex'}
-                                                justifyContent={'flex-end'}
+                                        </Card>
+                                        <Box
+                                            height={'fit-content'}
+                                            width={'fit-content'}
+                                            display={'flex'}
+                                            flexDirection={'column'}
+                                            justifyContent={'flex-end'}
+                                            alignItems={'flex-end'}
+                                        >
+                                            <Tooltip
+                                                title={t('add_restriction')}
                                             >
-                                                <Tooltip
-                                                    title={t('add_restriction')}
-                                                >
-                                                    <AddRestrictionButton
-                                                        // When this button is clicked, a pop up will show.
-                                                        // This popup will allow you to choose to make a restriction yourself,
-                                                        // create one starting from a template,
-                                                        // or choose a file from the system.
-                                                        restrictions={
-                                                            restrictions
-                                                        }
-                                                        setRestrictions={(
+                                                <AddRestrictionButton
+                                                    // When this button is clicked, a pop up will show.
+                                                    // This popup will allow you to choose to make a restriction yourself,
+                                                    // create one starting from a template,
+                                                    // or choose a file from the system.
+                                                    restrictions={restrictions}
+                                                    setRestrictions={(
+                                                        newRestrictions
+                                                    ) =>
+                                                        setRestrictions(
                                                             newRestrictions
-                                                        ) =>
-                                                            setRestrictions(
-                                                                newRestrictions
-                                                            )
-                                                        }
-                                                        userid={user.user}
-                                                    ></AddRestrictionButton>
-                                                </Tooltip>
-                                            </Box>
-                                        </Card>
+                                                        )
+                                                    }
+                                                    userid={user.user}
+                                                ></AddRestrictionButton>
+                                            </Tooltip>
+                                        </Box>
                                     </Box>
                                     {/* Main actions section */}
                                     <Box
diff --git a/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionTemplateUI.tsx b/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionTemplateUI.tsx
index 070550be..857cc83f 100644
--- a/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionTemplateUI.tsx
+++ b/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionTemplateUI.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 import {
     Box,
     TextField,
diff --git a/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionsDialog.tsx b/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionsDialog.tsx
index 942d6d54..7a719850 100644
--- a/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionsDialog.tsx
+++ b/frontend/frontend/src/pages/addChangeAssignmentPage/RestrictionsDialog.tsx
@@ -81,7 +81,6 @@ export default function RestrictionsDialog({
 }: RestrictionsDialogProps) {
     const [openTextEditor, setOpenTextEditor] = useState(false)
     const [openTemplateInterface, setOpenTemplateInterface] = useState(false)
-    const [mustPass, setMustPass] = useState(false)
     const [openTemplateInUI, setOpenTemplateInUI] = useState(false)
     const [textFieldContent, setTextFieldContent] = useState('')
     const [restrictionName, setRestrictionName] = useState('')
@@ -103,7 +102,7 @@ export default function RestrictionsDialog({
                 const newRestriction: restriction = {
                     script: file.name,
                     file: file,
-                    moet_slagen: mustPass,
+                    moet_slagen: false,
                 }
                 newRestrictions.push(newRestriction)
             }
@@ -126,7 +125,7 @@ export default function RestrictionsDialog({
                 restrictionName + restrictionType,
                 { type: 'text/plain' }
             ),
-            moet_slagen: mustPass,
+            moet_slagen: false,
         }
         setRestrictions([...restrictions, newRestriction])
         handleCloseTextEditor()
@@ -239,21 +238,6 @@ export default function RestrictionsDialog({
             >
                 {buttons}
             </Box>
-            <Box
-                paddingTop="5px"
-                display={'flex'}
-                flexDirection={'row'}
-                alignItems={'center'}
-            >
-                <Typography variant={'body2'}>
-                    {t('must_pass') + ':'}
-                </Typography>
-                <Switch
-                    id="mustPassSwitch"
-                    value={mustPass}
-                    onChange={() => setMustPass(!mustPass)}
-                />
-            </Box>
             <Box padding="20px" />
             <Typography variant={'h6'} color={'secondary.contrastText'}>
                 {t('choose_existing') + ':'}
diff --git a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
index a5da5ff8..ffa4f0cd 100644
--- a/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
+++ b/frontend/frontend/src/pages/assignmentPage/AssignmentPage.tsx
@@ -32,6 +32,7 @@ import WarningPopup from '../../components/WarningPopup.tsx'
 import { User } from '../subjectsPage/AddChangeSubjectPage.tsx'
 import StudentPopUp from '../subjectsPage/StudentPopUp.tsx'
 import axios, { AxiosResponse } from 'axios'
+import { GroupAccessComponent } from '../../components/GroupAccessComponent.tsx'
 
 // group interface
 export interface Group {
@@ -186,15 +187,18 @@ export function AssignmentPage() {
             const groupResponse = await instance.get(
                 `groepen/?student=${user.user}&project=${assignmentId}`
             )
-            const group: Group = groupResponse.data[0]
 
-            const studentPromises: Promise<AxiosResponse<User>>[] =
-                group.studenten.map((id: number) =>
-                    instance.get('/gebruikers/' + id)
-                )
+            if (groupResponse.data.length > 0) {
+                const group: Group = groupResponse.data[0]
+
+                const studentPromises: Promise<AxiosResponse<User>>[] =
+                    group.studenten.map((id: number) =>
+                        instance.get('/gebruikers/' + id)
+                    )
 
-            const temp_students = await axios.all(studentPromises)
-            setStudents(temp_students.map((res) => res.data))
+                const temp_students = await axios.all(studentPromises)
+                setStudents(temp_students.map((res) => res.data))
+            }
 
             setStudentsLoading(false)
         }
@@ -406,26 +410,20 @@ export function AssignmentPage() {
                                                 height={50}
                                             />
                                         ) : (
-                                            <>
-                                                {assignment !== undefined &&
-                                                    assignment.deadline !==
-                                                        null && (
-                                                        <Typography
-                                                            variant="h6"
-                                                            color={
-                                                                'text.primary'
-                                                            }
-                                                        >
-                                                            {assignment
-                                                                ? dayjs(
-                                                                      assignment.deadline
-                                                                  ).format(
-                                                                      'DD/MM/YYYY-HH:MM'
-                                                                  )
-                                                                : 'no deadline'}
-                                                        </Typography>
-                                                    )}
-                                            </>
+                                            <Typography
+                                                variant="h6"
+                                                color={
+                                                    'text.primary'
+                                                }
+                                            >
+                                                {assignment && assignment.deadline
+                                                    ? dayjs(
+                                                            assignment.deadline
+                                                        ).format(
+                                                            'DD/MM/YYYY HH:mm'
+                                                        )
+                                                    : t('no_deadline')}
+                                            </Typography>
                                         )}
                                     </Box>
                                     {loading ? (
@@ -440,60 +438,59 @@ export function AssignmentPage() {
                                         />
                                     ) : (
                                         <>
-                                            <>
-                                                {assignment?.student_groep ? (
-                                                    <Button
-                                                        sx={{
-                                                            bgcolor:
-                                                                'secondary.main',
-                                                            textTransform:
-                                                                'none',
-                                                        }}
-                                                        onClick={goToGroups}
-                                                    >
-                                                        <Typography color="secondary.contrastText">
-                                                            {t('group')}
-                                                        </Typography>
-                                                    </Button>
-                                                ) : (
-                                                    <Box
-                                                        sx={{
-                                                            position:
-                                                                'absolute',
-                                                            top: 90,
-                                                            right: 50,
-                                                            display: 'flex',
-                                                            justifyContent:
-                                                                'flex-end',
-                                                            zIndex: 1,
-                                                            marginTop: '-40px',
-                                                        }}
-                                                    >
-                                                        {assignment?.max_groep_grootte ===
-                                                        1 ? (
-                                                            <Typography variant="body1">
-                                                                {user.first_name +
-                                                                    ' ' +
-                                                                    user.last_name}
-                                                            </Typography>
-                                                        ) : (
-                                                            <>
-                                                                <StudentPopUp
-                                                                    students={
-                                                                        studentsLoading
-                                                                            ? []
-                                                                            : students
-                                                                    }
-                                                                    text="group_members"
-                                                                />
-                                                            </>
-                                                        )}
-                                                    </Box>
-                                                )}
-                                            </>
+                                            {(assignment?.max_groep_grootte
+                                                ? assignment.max_groep_grootte
+                                                : 1) > 1 && (
+                                                <GroupAccessComponent
+                                                    assignmentid={parseInt(
+                                                        assignmentId
+                                                    )}
+                                                    courseid={parseInt(
+                                                        courseId
+                                                    )}
+                                                />
+                                            )}
                                         </>
                                     )}
                                 </Box>
+                                {/*extra deadline*/}
+                                {assignment?.extra_deadline && (
+                                    <Box
+                                        display={'flex'}
+                                        flexDirection={'row'}
+                                        alignItems={'center'}
+                                        gap={1}
+                                        pl={2.5}
+                                    >
+                                        <Typography
+                                            variant="h6"
+                                            color="text.primary"
+                                            fontWeight={'bold'}
+                                        >
+                                            Extra Deadline:
+                                        </Typography>
+                                        {loading ? (
+                                            <Skeleton
+                                                variant="text"
+                                                width={180}
+                                                height={50}
+                                            />
+                                        ) : (
+                                            <Typography
+                                                variant="h6"
+                                                color={'text.primary'}
+                                            >
+                                                {assignment
+                                                    ? dayjs(
+                                                          assignment.extra_deadline
+                                                      ).format(
+                                                          'DD/MM/YYYY HH:mm'
+                                                      )
+                                                    : 'no deadline'}
+                                            </Typography>
+                                        )}
+                                    </Box>
+                                )}
 
                                 {/* Assignment description */}
                                 <Card sx={{ padding: '20px' }}>
@@ -758,26 +755,20 @@ export function AssignmentPage() {
                                                     height={50}
                                                 />
                                             ) : (
-                                                <>
-                                                    {assignment !== undefined &&
-                                                        assignment.deadline !==
-                                                            null && (
-                                                            <Typography
-                                                                variant="h6"
-                                                                color={
-                                                                    'text.primary'
-                                                                }
-                                                            >
-                                                                {assignment
-                                                                    ? dayjs(
-                                                                          assignment.deadline
-                                                                      ).format(
-                                                                          'DD/MM/YYYY-HH:MM'
-                                                                      )
-                                                                    : 'no deadline'}
-                                                            </Typography>
-                                                        )}
-                                                </>
+                                                <Typography
+                                                    variant="h6"
+                                                    color={
+                                                        'text.primary'
+                                                    }
+                                                >
+                                                    {assignment && assignment.deadline
+                                                        ? dayjs(
+                                                                assignment.deadline
+                                                            ).format(
+                                                                'DD/MM/YYYY HH:mm'
+                                                            )
+                                                        : t('no_deadline')}
+                                                </Typography>
                                             )}
                                         </Box>
                                         <Box style={{ flexGrow: 1 }} />
@@ -837,6 +828,7 @@ export function AssignmentPage() {
                                                                             : students
                                                                     }
                                                                     text="group_members"
+                                                                    noGroup={students.length == 0}
                                                                 />
                                                             </>
                                                         )}
@@ -877,7 +869,7 @@ export function AssignmentPage() {
                                                     ? dayjs(
                                                           assignment.extra_deadline
                                                       ).format(
-                                                          'DD/MM/YYYY-HH:MM'
+                                                          'DD/MM/YYYY HH:mm'
                                                       )
                                                     : 'no deadline'}
                                             </Typography>
@@ -1058,16 +1050,8 @@ export function AssignmentPage() {
                                                                         <SubmissionListItemStudentPage
                                                                             realId={submission.indiening_id.toString()}
                                                                             visualId={(
-                                                                                submission.indiening_id -
-                                                                                Math.min(
-                                                                                    ...submissions.map(
-                                                                                        (
-                                                                                            submission
-                                                                                        ) =>
-                                                                                            submission.indiening_id
-                                                                                    )
-                                                                                ) +
-                                                                                1
+                                                                                submissions.length -
+                                                                                index
                                                                             ).toString()}
                                                                             timestamp={dayjs(
                                                                                 submission.tijdstip
diff --git a/frontend/frontend/src/pages/loginPage/LoginPage.tsx b/frontend/frontend/src/pages/loginPage/LoginPage.tsx
index ff1e209a..28b4cb29 100644
--- a/frontend/frontend/src/pages/loginPage/LoginPage.tsx
+++ b/frontend/frontend/src/pages/loginPage/LoginPage.tsx
@@ -81,7 +81,7 @@ export function LoginPage() {
                         alignSelf={'center'}
                     >
                         <Box
-                            id='logo'
+                            id="logo"
                             component="img"
                             src={t('logo_blue')}
                             alt="logo"
@@ -93,7 +93,7 @@ export function LoginPage() {
                         />
                         <Box
                             component="img"
-                            src={'assets/logo_duif.png'}
+                            src={'/assets/logo_duif.png'}
                             alt="logo_app"
                             sx={{
                                 padding: 0,
diff --git a/frontend/frontend/src/pages/mainPage/ArchivedView.tsx b/frontend/frontend/src/pages/mainPage/ArchivedView.tsx
index 616165b6..5dec46d6 100644
--- a/frontend/frontend/src/pages/mainPage/ArchivedView.tsx
+++ b/frontend/frontend/src/pages/mainPage/ArchivedView.tsx
@@ -3,6 +3,7 @@ import { CourseCard } from '../../components/CourseCard.tsx'
 import { Course } from './MainPage.tsx'
 
 interface CourseCardProps {
+    userid: number
     isStudent: boolean
     archivedCourses: Course[]
     pinnedCourses: number[]
@@ -10,6 +11,7 @@ interface CourseCardProps {
 }
 
 export function ArchivedView({
+    userid,
     isStudent,
     archivedCourses,
     pinnedCourses,
@@ -19,7 +21,7 @@ export function ArchivedView({
         <>
             <Stack
                 flexDirection={{ xs: 'column-reverse', md: 'row' }}
-                minWidth={{ md: '62svw', lg: '73svw' }}
+                minWidth={{ md: '47svw', lg: '68svw' }}
             >
                 <Stack
                     direction={'column'}
@@ -40,6 +42,7 @@ export function ArchivedView({
                         {archivedCourses.map((course) => {
                             return (
                                 <CourseCard
+                                    userid={userid}
                                     courseId={course.vak_id.toString()}
                                     archived={true}
                                     isStudent={isStudent}
diff --git a/frontend/frontend/src/pages/mainPage/CoursesView.tsx b/frontend/frontend/src/pages/mainPage/CoursesView.tsx
index 5660a1cf..d89dbd5e 100644
--- a/frontend/frontend/src/pages/mainPage/CoursesView.tsx
+++ b/frontend/frontend/src/pages/mainPage/CoursesView.tsx
@@ -5,6 +5,7 @@ import { useNavigate } from 'react-router-dom'
 import { Course } from './MainPage.tsx'
 
 interface CourseCardProps {
+    userid: number
     isStudent: boolean
     activecourses: Course[]
     pinnedCourses: number[]
@@ -13,6 +14,7 @@ interface CourseCardProps {
 }
 
 export function CoursesView({
+    userid,
     isStudent,
     activecourses,
     pinnedCourses,
@@ -25,7 +27,7 @@ export function CoursesView({
         <>
             <Stack
                 flexDirection={{ xs: 'column-reverse', md: 'row' }}
-                minWidth={{ md: '62svw', lg: '73svw' }}
+                minWidth={{ md: '47svw', lg: '68svw' }}
             >
                 <Stack
                     direction={'column'}
@@ -46,6 +48,7 @@ export function CoursesView({
                         A CourseCard displays brief information about the course such as the title, deadlines, ...*/}
                         {activecourses.map((course: Course) => (
                             <CourseCard
+                                userid={userid}
                                 key={course.naam}
                                 courseId={course.vak_id.toString()}
                                 archived={false}
diff --git a/frontend/frontend/src/pages/mainPage/MainPage.tsx b/frontend/frontend/src/pages/mainPage/MainPage.tsx
index b02a936f..52a9b7f5 100644
--- a/frontend/frontend/src/pages/mainPage/MainPage.tsx
+++ b/frontend/frontend/src/pages/mainPage/MainPage.tsx
@@ -1,6 +1,6 @@
 import { Header } from '../../components/Header.tsx'
 import { Button } from '../../components/CustomComponents.tsx'
-import { Box, Stack } from '@mui/material'
+import { Box, MenuItem, Select, Stack } from '@mui/material'
 import TabSwitcher from '../../components/TabSwitcher.tsx'
 import { ArchivedView } from './ArchivedView.tsx'
 import { CoursesView } from './CoursesView.tsx'
@@ -17,6 +17,7 @@ import WarningPopup from '../../components/WarningPopup.tsx'
 export interface Course {
     vak_id: number
     naam: string
+    jaartal: number
     studenten: number[]
     lesgevers: number[]
     gearchiveerd: boolean
@@ -50,15 +51,13 @@ export default function MainPage() {
     const [courseOrder, setCourseOrder] = useState<number[]>([])
     const [deadlines, setDeadlines] = useState<Dayjs[]>([])
     const [loading, setLoading] = useState<boolean>(true)
+    const [selectedYear, setSelectedYear] = useState<number>(dayjs().year())
 
     //navigator for routing
     const [assignments, setAssignments] = useState<project[]>([])
     const navigator = useNavigate()
 
     useEffect(() => {
-        console.log('requesting api')
-        //set loading to true every time the data is requested
-
         // Get the courses, their projects, and their respective deadlines + the role of the user
         async function fetchData() {
             //set loading to true every time the data is requested
@@ -203,8 +202,8 @@ export default function MainPage() {
                                               md: 'row',
                                           }}
                                           minWidth={{
-                                              md: '60svw',
-                                              lg: '69svw',
+                                              md: '40svw',
+                                              lg: '49svw',
                                           }}
                                       >
                                           {[...Array(3)].map((_, index) => (
@@ -217,8 +216,8 @@ export default function MainPage() {
                                               md: 'row',
                                           }}
                                           minWidth={{
-                                              md: '60svw',
-                                              lg: '69svw',
+                                              md: '40svw',
+                                              lg: '49svw',
                                           }}
                                       >
                                           {[...Array(3)].map((_, index) => (
@@ -228,11 +227,14 @@ export default function MainPage() {
                                   ]
                                 : [
                                       <CoursesView
+                                          userid={user}
                                           isStudent={role == 'student'}
                                           activecourses={courses
                                               .filter(
                                                   (course) =>
-                                                      !course.gearchiveerd
+                                                      !course.gearchiveerd &&
+                                                      course.jaartal ===
+                                                          selectedYear
                                               )
                                               .sort((a: Course, b: Course) => {
                                                   if (
@@ -273,6 +275,7 @@ export default function MainPage() {
                                           pinCourse={pinCourse}
                                       />,
                                       <ArchivedView
+                                          userid={user}
                                           isStudent={role == 'student'}
                                           archivedCourses={courses
                                               .filter(
@@ -319,7 +322,37 @@ export default function MainPage() {
                                   ]
                         }
                     />
-
+                    <Box
+                        height={'100%'}
+                        display={'flex'}
+                        flexDirection={'column'}
+                        justifyContent={'center'}
+                        alignItems={'flex-start'}
+                        mb={2}
+                    >
+                        <Select
+                            variant={'outlined'}
+                            color={'primary'}
+                            value={selectedYear}
+                            onChange={(e) =>
+                                setSelectedYear(e.target.value as number)
+                            }
+                            label="Select Academic Year"
+                            sx={{
+                                minWidth: 150,
+                                '& .MuiSelect-outlined': {
+                                    border: 1.5,
+                                    borderColor: 'primary.main',
+                                },
+                            }}
+                        >
+                            {[2022, 2023, 2024, 2025].map((year) => (
+                                <MenuItem key={year} value={year}>
+                                    {year}
+                                </MenuItem>
+                            ))}
+                        </Select>
+                    </Box>
                     {/* Add a calendar to the right of the mainpage. */}
                     <Box
                         aria-label={'calendarView'}
diff --git a/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx b/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
index c49aad4c..52ae6366 100644
--- a/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
+++ b/frontend/frontend/src/pages/subjectsPage/AddChangeSubjectPage.tsx
@@ -18,7 +18,7 @@ import {
     Typography,
 } from '@mui/material'
 import { Header } from '../../components/Header'
-import React, { ChangeEvent, useEffect, useState } from 'react'
+import React, { ChangeEvent, useEffect, useRef, useState } from 'react'
 import { useNavigate, useParams } from 'react-router-dom'
 import List from '@mui/material/List'
 import { t } from 'i18next'
@@ -43,7 +43,8 @@ function UserList(
     loading: boolean,
     users: User[],
     setSelected: React.Dispatch<React.SetStateAction<number>>,
-    setOpen: React.Dispatch<React.SetStateAction<boolean>>
+    setOpen: React.Dispatch<React.SetStateAction<boolean>>,
+    handleRemove: () => void
 ) {
     return (
         <Box marginTop={3}>
@@ -70,7 +71,12 @@ function UserList(
                         {users.map((user) => {
                             const handleClickOpen = () => {
                                 setSelected(user.user)
-                                setOpen(true)
+
+                                if (user.is_lesgever) {
+                                    setOpen(true)
+                                } else {
+                                    handleRemove()
+                                }
                             }
                             {
                                 /* The list of users is mapped onto buttons
@@ -79,7 +85,12 @@ function UserList(
                             return (
                                 <>
                                     <Divider />
-                                    <ListItem>
+                                    <ListItem
+                                        disabled={
+                                            users.length == 1 &&
+                                            users[0].is_lesgever
+                                        }
+                                    >
                                         <EvenlySpacedRow
                                             items={[
                                                 <ListItemText
@@ -127,7 +138,6 @@ function UserList(
                                             ]}
                                         />
                                     </ListItem>
-
                                 </>
                             )
                         })}
@@ -145,7 +155,8 @@ function UploadPart(
     handleFileChange: (e: ChangeEvent<HTMLInputElement>) => void,
     setEmail: React.Dispatch<React.SetStateAction<string>>,
     handleAdd: () => void,
-    str: string
+    str: string,
+    textFieldRef: React.RefObject<HTMLInputElement>
 ) {
     return (
         <>
@@ -160,6 +171,7 @@ function UploadPart(
                                 onChange={(event) =>
                                     setEmail(event.target.value)
                                 }
+                                inputRef={textFieldRef}
                             />
                         </Box>
                         <Box>
@@ -227,6 +239,8 @@ export function AddChangeSubjectPage() {
     const [studentFile, setStudentFile] = useState<File>()
     const [teacherFile, setTeacherFile] = useState<File>()
     const [user, setUser] = useState<User>()
+    const studentRef = useRef<HTMLInputElement>(null)
+    const teacherRef = useRef<HTMLInputElement>(null)
 
     const [vakID, setVakID] = useState(params.courseId)
 
@@ -239,15 +253,12 @@ export function AddChangeSubjectPage() {
     }
 
     const handleRemoveStudent = (): void => {
-        setStudents((oldstudents: User[]): User[] => {
-            for (let i = 0; i < oldstudents.length; i++) {
-                if (oldstudents[i].user == selectedStudent) {
-                    oldstudents.splice(i, 1)
-                    return oldstudents
-                }
-            }
-            return oldstudents
-        })
+        const newstudents = students.filter(
+            (student) => student.user != selectedStudent
+        )
+
+        setStudents(newstudents)
+
         setOpenStudent(false)
     }
 
@@ -257,6 +268,7 @@ export function AddChangeSubjectPage() {
             .then((res) => {
                 setStudents((oldstudents) => {
                     if (res.data.length == 0) {
+                        alert(t('this_user_doesnt_exist'))
                         return oldstudents
                     }
                     return addUser(false, res.data[0], oldstudents)
@@ -267,6 +279,11 @@ export function AddChangeSubjectPage() {
             })
 
         handleUploadStudent()
+
+        if (studentRef.current) {
+            studentRef.current.value = '';
+            setEmailStudent('')
+        }
     }
 
     const handleStudentFileChange = (
@@ -328,15 +345,10 @@ export function AddChangeSubjectPage() {
     // This function will remove a teacher from the list.
     // It does so by looping through the list and removing the teacher with the correct ID.
     const handleRemoveTeacher = () => {
-        setTeachers((oldteacher) => {
-            for (let i = 0; i < oldteacher.length; i++) {
-                if (oldteacher[i].user == selectedTeacher) {
-                    oldteacher.splice(i, 1)
-                    return oldteacher
-                }
-            }
-            return oldteacher
-        })
+        const newTeachers = teachers.filter(
+            (teacher) => teacher.user != selectedTeacher
+        )
+        setTeachers(newTeachers)
         setOpenTeacher(false)
     }
 
@@ -348,6 +360,7 @@ export function AddChangeSubjectPage() {
                     //This is like this to prevent the same user being in the list twice
 
                     if (res.data.length == 0) {
+                        alert(t('this_user_doesnt_exist'))
                         return oldteachers
                     }
 
@@ -358,6 +371,11 @@ export function AddChangeSubjectPage() {
                 console.log(err)
             })
         handleUploadTeacher()
+
+        if (teacherRef.current) {
+            teacherRef.current.value = '';
+            setEmailTeacher('')
+        }
     }
 
     const handleTeacherFileChange = (
@@ -422,6 +440,11 @@ export function AddChangeSubjectPage() {
         let found = false
         const id = userData.user
         if (userData.is_lesgever != isLesgever) {
+            if (userData.is_lesgever){
+                alert(t('cant_add_teachers_to_student_list'))
+            } else {
+                alert(t('cant_add_students_to_teacher_list'))
+            }
             return olduser
         }
         for (const teacher of olduser) {
@@ -430,6 +453,7 @@ export function AddChangeSubjectPage() {
             }
         }
         if (found) {
+            alert(t('cant_add_users_twice'))
             return olduser
         } else {
             return [...olduser, userData]
@@ -461,6 +485,7 @@ export function AddChangeSubjectPage() {
                 })
                 .catch((err) => {
                     console.log(err)
+                    alert(err.response.data)
                 })
         }
     }
@@ -469,6 +494,9 @@ export function AddChangeSubjectPage() {
         async function fetchUser() {
             setUserLoading(true)
             const userResponse = await instance.get('/gebruikers/me/')
+            if (vakID == undefined) {
+                setTeachers([userResponse.data])
+            }
             setUser(userResponse.data)
             setUserLoading(false)
         }
@@ -564,7 +592,7 @@ export function AddChangeSubjectPage() {
                         <>
                             <Stack direction={'column'}>
                                 <Header
-                                    variant={loading ? 'default' : 'not_main'}
+                                    variant={'default'}
                                     title={loading ? '' : title}
                                 />
                                 <Stack
@@ -622,13 +650,27 @@ export function AddChangeSubjectPage() {
                                                 />
                                             )}
                                         </Box>
-                                        <Box padding={'20px'}>
+                                        <Box
+                                            padding={'20px'}
+                                            display={'flex'}
+                                            flexDirection={'row'}
+                                            gap={2}
+                                        >
                                             <SecondaryButton
+                                                /* This is the large save button on the top of the page */
+                                                onClick={() =>
+                                                    navigate(`/course/${vakID}`)
+                                                }
+                                            >
+                                                {t('cancel')}
+                                            </SecondaryButton>
+
+                                            <Button
                                                 /* This is the large save button on the top of the page */
                                                 onClick={handleSave}
                                             >
                                                 {t('save')}
-                                            </SecondaryButton>
+                                            </Button>
                                         </Box>
                                     </Box>
                                     <Stack direction={'row'} gap={10}>
@@ -660,7 +702,8 @@ export function AddChangeSubjectPage() {
                                                             loading,
                                                             students,
                                                             setSelectedStudent,
-                                                            setOpenStudent
+                                                            setOpenStudent,
+                                                            handleRemoveStudent
                                                         )}
                                                     </Box>
                                                 </Card>
@@ -670,14 +713,15 @@ export function AddChangeSubjectPage() {
                                                         handleStudentFileChange,
                                                         setEmailStudent,
                                                         handleAddStudent,
-                                                        t('upload_students')
+                                                        t('upload_students'),
+                                                        studentRef,
                                                     )}
                                                 </Box>
                                                 {DialogWindow(
                                                     handleCloseStudent,
                                                     openStudent,
                                                     handleRemoveStudent,
-                                                    t('delete_student')
+                                                    t('delete_student'),
                                                 )}
                                             </Stack>
                                         </Box>
@@ -709,7 +753,8 @@ export function AddChangeSubjectPage() {
                                                             loading,
                                                             teachers,
                                                             setSelectedTeacher,
-                                                            setOpenTeacher
+                                                            setOpenTeacher,
+                                                            handleRemoveTeacher
                                                         )}
                                                     </Box>
                                                 </Card>
@@ -719,7 +764,8 @@ export function AddChangeSubjectPage() {
                                                         handleTeacherFileChange,
                                                         setEmailTeacher,
                                                         handleAddTeacher,
-                                                        t('upload_teachers')
+                                                        t('upload_teachers'),
+                                                        teacherRef,
                                                     )}
                                                 </Box>
                                                 {DialogWindow(
diff --git a/frontend/frontend/src/pages/subjectsPage/AssignmentListItemSubjectsPage.tsx b/frontend/frontend/src/pages/subjectsPage/AssignmentListItemSubjectsPage.tsx
index 286bca7c..11fd7e66 100644
--- a/frontend/frontend/src/pages/subjectsPage/AssignmentListItemSubjectsPage.tsx
+++ b/frontend/frontend/src/pages/subjectsPage/AssignmentListItemSubjectsPage.tsx
@@ -31,9 +31,9 @@ import { EvenlySpacedRow } from '../../components/CustomComponents.tsx'
 
 interface AssignmentListItemSubjectsPageProps {
     projectName: string
-    dueDate: Dayjs
+    dueDate: Dayjs | undefined
     submissions: number
-    score: Score
+    score: Score | undefined
     maxScore: number
     isStudent: boolean
     archived: boolean
@@ -119,7 +119,7 @@ export function AssignmentListItemSubjectsPage({
                                         />
                                     ) : (
                                         <ListItemText
-                                            primary={`0/${maxScore} (0%)`}
+                                            primary={t('no_score_yet')}
                                         />
                                     )}
                                 </>,
diff --git a/frontend/frontend/src/pages/subjectsPage/ProjectsView.tsx b/frontend/frontend/src/pages/subjectsPage/ProjectsView.tsx
index 0e7a64e4..c40f2be5 100644
--- a/frontend/frontend/src/pages/subjectsPage/ProjectsView.tsx
+++ b/frontend/frontend/src/pages/subjectsPage/ProjectsView.tsx
@@ -271,10 +271,14 @@ export function ProjectsView({
                                                     projectName={
                                                         project.assignment.titel
                                                     }
-                                                    dueDate={dayjs(
-                                                        project.assignment
-                                                            .deadline
-                                                    )}
+                                                    dueDate={
+                                                        project.assignment.deadline
+                                                            ? dayjs(
+                                                              project.assignment
+                                                                .deadline
+                                                              )
+                                                            : undefined
+                                                    }
                                                     submissions={
                                                         project.submissions
                                                             ? project.submissions
@@ -282,12 +286,6 @@ export function ProjectsView({
                                                     }
                                                     score={
                                                         project.score
-                                                            ? project.score
-                                                            : {
-                                                                  score_id: 0,
-                                                                  score: 0,
-                                                                  indiening: 0,
-                                                              }
                                                     }
                                                     maxScore={Number(
                                                         project.assignment
diff --git a/frontend/frontend/src/pages/subjectsPage/StudentPopUp.tsx b/frontend/frontend/src/pages/subjectsPage/StudentPopUp.tsx
index cc728f50..f045e495 100644
--- a/frontend/frontend/src/pages/subjectsPage/StudentPopUp.tsx
+++ b/frontend/frontend/src/pages/subjectsPage/StudentPopUp.tsx
@@ -17,9 +17,10 @@ import { t } from 'i18next'
 interface StudentPopUpProps {
     students: User[]
     text: string
+    noGroup: boolean
 }
 
-export default function StudentPopUp({ students, text }: StudentPopUpProps) {
+export default function StudentPopUp({ students, text, noGroup }: StudentPopUpProps) {
     const [open, setOpen] = React.useState(false)
 
     const handleClose = () => {
@@ -59,22 +60,35 @@ export default function StudentPopUp({ students, text }: StudentPopUpProps) {
                     </IconButton>
                 </DialogTitle>
                 <DialogContent dividers>
-                    {/* List of Students */}
-                    {students.length > 0 ? (
-                        <List>
-                            {students.map((student) => (
-                                <ListItem key={student.user}>
-                                    <ListItemText
-                                        primary={`${student.first_name} ${student.last_name}`}
-                                    />
-                                </ListItem>
-                            ))}
-                        </List>
-                    ) : (
-                        <Typography variant="body1">
-                            {t('loading') + ' ' + t('students') + '...'}
-                        </Typography>
-                    )}
+                    {noGroup ?
+                        <>
+                            <Typography variant="body1">
+                                {t('noGroup')}
+                            </Typography>
+                            <Typography variant="body1">
+                                {t('contactTeacher')}
+                            </Typography>
+                        </>
+                    :
+                        <>
+                            {/* List of Students */}
+                            {students.length > 0 ? (
+                                <List>
+                                    {students.map((student) => (
+                                        <ListItem key={student.user}>
+                                            <ListItemText
+                                                primary={`${student.first_name} ${student.last_name}`}
+                                            />
+                                        </ListItem>
+                                    ))}
+                                </List>
+                            ) : (
+                                <Typography variant="body1">
+                                    {t('loading') + ' ' + t('students') + '...'}
+                                </Typography>
+                            )}
+                        </>
+                    }
                 </DialogContent>
             </Dialog>
         </>
diff --git a/frontend/frontend/src/pages/subjectsPage/SubjectsPage.tsx b/frontend/frontend/src/pages/subjectsPage/SubjectsPage.tsx
index 83f6e456..86909b4b 100644
--- a/frontend/frontend/src/pages/subjectsPage/SubjectsPage.tsx
+++ b/frontend/frontend/src/pages/subjectsPage/SubjectsPage.tsx
@@ -455,6 +455,7 @@ export function SubjectsPage() {
                                             studentsLoading ? [] : students
                                         }
                                         text="students"
+                                        noGroup={false}
                                     ></StudentPopUp>
                                 </Box>
                             </Stack>
diff --git a/frontend/frontend/src/pages/submissionPage/SubmissionPage.tsx b/frontend/frontend/src/pages/submissionPage/SubmissionPage.tsx
index 0654ade6..a2a7cb76 100644
--- a/frontend/frontend/src/pages/submissionPage/SubmissionPage.tsx
+++ b/frontend/frontend/src/pages/submissionPage/SubmissionPage.tsx
@@ -298,6 +298,7 @@ export function SubmissionPage() {
                             <StudentPopUp
                                 students={studentsLoading ? [] : students}
                                 text="group_members"
+                                noGroup={false}
                             />
                         )}
                     </Box>