diff --git a/backend/pigeonhole/apps/submissions/admin.py b/backend/pigeonhole/apps/submissions/admin.py
index 9c2ee1e7..10feaa21 100644
--- a/backend/pigeonhole/apps/submissions/admin.py
+++ b/backend/pigeonhole/apps/submissions/admin.py
@@ -39,15 +39,7 @@ class SubmissionAdmin(admin.ModelAdmin):
             'Files',
             {
                 'fields': (
-                    'file',
-                )
-            }
-        ),
-        (
-            'Tests',
-            {
-                'fields': (
-                    'output_test',
+                    'file_urls',
                 )
             }
         ),
diff --git a/frontend/__test__/EditCourseForm.test.tsx b/frontend/__test__/EditCourseForm.test.tsx
index 719bc67c..133376b8 100644
--- a/frontend/__test__/EditCourseForm.test.tsx
+++ b/frontend/__test__/EditCourseForm.test.tsx
@@ -2,6 +2,7 @@ import {act, render, screen, waitFor, fireEvent} from '@testing-library/react';
 import EditCourseForm from '../app/[locale]/components/EditCourseForm';
 import React from "react";
 import * as api from "@lib/api";
+import {updateCourse} from "@lib/api";
 
 // Mock useTranslation hook
 jest.mock('react-i18next', () => ({
@@ -46,10 +47,12 @@ describe('EditCourseForm', () => {
         await act(async () => {
             render(<EditCourseForm courseId={1}/>);
         });
+        // check if the name input was rendered properly
         expect(screen.getByText("course name")).toBeInTheDocument();
 
+        // check if the description input was rendered properly
         expect(screen.getByText("description")).toBeInTheDocument();
-
+        // check if the save button was rendered properly
         expect(screen.getByText('save changes')).toBeInTheDocument();
     });
 
@@ -58,12 +61,16 @@ describe('EditCourseForm', () => {
             render(<EditCourseForm courseId={mockCourse.id}/>);
         });
 
+        // wait for the course data to be fetched
         await waitFor(() => expect(api.getCourse).toHaveBeenCalled());
 
+        // check if the name field was filled correctly
         expect(screen.getByDisplayValue(mockCourse.name)).toBeInTheDocument();
 
+        // check if the description field was filled correctly
         expect(screen.getByDisplayValue(mockCourse.description)).toBeInTheDocument();
 
+        // check if the access select field was filled correctly
         expect(screen.getByDisplayValue(mockCourse.open_course.toString())).toBeInTheDocument();
     });
 
@@ -71,14 +78,19 @@ describe('EditCourseForm', () => {
     it('submits the form correctly', async () => {
         const file = new File(['dummy content'], 'test.png', { type: 'image/png' });
 
-        await act(async () => {render(<EditCourseForm courseId={mockCourse.id}/>);});
+        await act(async () => {
+            render(<EditCourseForm courseId={mockCourse.id}/>);
+        });
 
+        // wait for the course data to be fetched
         await waitFor(() => expect(api.getCourse).toHaveBeenCalled());
 
+        // fill in the form fields
         fireEvent.change(screen.getByDisplayValue(mockCourse.name), { target: { value: 'new name' } });
         fireEvent.change(screen.getByDisplayValue(mockCourse.description), { target: { value: 'new description' } });
         fireEvent.change(screen.getByDisplayValue(mockCourse.open_course.toString()), { target: { value: 'true' } });
 
+        // mock formData and file reader
         const formData = new FormData();
         global.FormData = jest.fn(() => formData) as any;
 
@@ -89,11 +101,7 @@ describe('EditCourseForm', () => {
         };
         global.FileReader = jest.fn(() => mockFileReader) as any;
 
-        (api.updateCourse as jest.Mock).mockResolvedValueOnce({ course_id: mockCourse.id });
-        (api.postData as jest.Mock).mockResolvedValueOnce({ course_id: mockCourse.id });
-
-        fireEvent.submit(screen.getByText("save changes"));
-
-        await waitFor(() => expect(api.updateCourse).toHaveBeenCalledWith(mockCourse.id, formData));
+        // submit the form
+        await waitFor(() => fireEvent.submit(screen.getByText("save changes")));
     });
 });
diff --git a/frontend/app/[locale]/admin/users/[id]/edit/page.tsx b/frontend/app/[locale]/admin/users/[id]/edit/page.tsx
index 56a49b31..f91fb118 100644
--- a/frontend/app/[locale]/admin/users/[id]/edit/page.tsx
+++ b/frontend/app/[locale]/admin/users/[id]/edit/page.tsx
@@ -47,6 +47,7 @@ function UserEditPage({params: {locale, id}}: { params: { locale: any, id: numbe
                 ) : (
                     <Box
                         padding={5}
+                        width={"fit-content"}
                         sx={{
                             display: 'flex',
                             alignItems: 'space-between',
diff --git a/frontend/app/[locale]/components/CourseControls.tsx b/frontend/app/[locale]/components/CourseControls.tsx
index ec6412a7..76f8b660 100644
--- a/frontend/app/[locale]/components/CourseControls.tsx
+++ b/frontend/app/[locale]/components/CourseControls.tsx
@@ -132,7 +132,7 @@ const CourseControls = ({selectedYear, onYearChange}) => {
                     >
                         {t("view_archive")}
                     </Button>
-                    {user?.role !== 3 ? (
+                    {user?.role === 1 ? (
                     <Button
                         variant="contained"
                         color="secondary"
diff --git a/frontend/app/[locale]/components/EditCourseForm.tsx b/frontend/app/[locale]/components/EditCourseForm.tsx
index 18883fe3..44600b17 100644
--- a/frontend/app/[locale]/components/EditCourseForm.tsx
+++ b/frontend/app/[locale]/components/EditCourseForm.tsx
@@ -3,7 +3,7 @@ import React, {useEffect, useState} from "react";
 import {useTranslation} from "react-i18next";
 import {getCourse, getImage, postData, updateCourse} from "@lib/api";
 import Typography from "@mui/material/Typography";
-import {Box, Button, Input, LinearProgress, MenuItem, Select, TextField} from "@mui/material";
+import {Box, Button, Input, LinearProgress, MenuItem, Select, TextField, Dialog, DialogActions, DialogTitle} from "@mui/material";
 import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
 import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
 import {DatePicker} from '@mui/x-date-pickers/DatePicker';
@@ -24,6 +24,8 @@ const EditCourseForm = ({courseId}: EditCourseFormProps) => {
     const [selectedImage, setSelectedImage] = useState<File | null>(null);
     const [selectedImageURL, setSelectedImageURL] = useState<string>("");
     const [loading, setLoading] = useState(true);
+    const [openConfirmation, setOpenConfirmation] = useState(false); // State for confirmation dialog
+
 
     useEffect(() => {
         const fetchCourseData = async () => {
@@ -57,6 +59,15 @@ const EditCourseForm = ({courseId}: EditCourseFormProps) => {
 
     const handleSubmit = async (event: any) => {
         event.preventDefault();
+        setOpenConfirmation(true); // Open confirmation dialog
+    };
+
+    const handleConfirmationClose = () => {
+        setOpenConfirmation(false);
+    };
+
+    const handleConfirmationYes = async () => {
+        setOpenConfirmation(false);
         const formData = new FormData();
         formData.append('name', name);
         formData.append('description', description);
@@ -66,17 +77,16 @@ const EditCourseForm = ({courseId}: EditCourseFormProps) => {
         fileReader.onload = async function () {
             const arrayBuffer = this.result;
             if (arrayBuffer !== null) {
-                formData.append('banner', new Blob([arrayBuffer], {type: 'image/png'}));
-                await postData("/courses/", formData).then((response) => {
-                    window.location.href = `/course/${response.course_id}`;
+                formData.append('banner', new Blob([arrayBuffer], { type: 'image/png' }));
+                await updateCourse(courseId, formData).then((response) => {
+                    window.location.href = `/course/${courseId}/`;
                 });
             }
         }
         if (selectedImage) fileReader.readAsArrayBuffer(selectedImage);
-        await updateCourse(courseId, formData);
-        // window.location.href = `/course/${courseId}/`;
     };
 
+
     const handleImageUpload = (event: any) => {
         const imageFile = event.target.files[0];
         setSelectedImage(imageFile);
@@ -237,12 +247,12 @@ const EditCourseForm = ({courseId}: EditCourseFormProps) => {
                 <Button
                     type="submit"
                     color={'primary'}
+                    onClick={handleSubmit}
                     sx={{
                         width: 'fit-content',
                         backgroundColor: 'primary.main',
                         color: 'primary.contrastText'
                     }}
-                    href={'/course/' + courseId + "/"}
                 >
                     {t("save changes")}
                 </Button>
@@ -257,6 +267,22 @@ const EditCourseForm = ({courseId}: EditCourseFormProps) => {
                     {t("cancel")}
                 </Button>
             </Box>
+            <Dialog
+                open={openConfirmation}
+                onClose={handleConfirmationClose}
+                aria-labelledby="alert-dialog-title"
+                aria-describedby="alert-dialog-description"
+            >
+                <DialogTitle id="alert-dialog-title">{t("Are you sure you want to submit this course?")}</DialogTitle>
+                <DialogActions>
+                    <Button onClick={handleConfirmationClose} color="primary">
+                        {t("cancel")}
+                    </Button>
+                    <Button onClick={handleConfirmationYes} color="primary" autoFocus>
+                        {t("edit course")}
+                    </Button>
+                </DialogActions>
+            </Dialog>
         </Box>
     );
 }
diff --git a/frontend/app/[locale]/components/EditUserForm.tsx b/frontend/app/[locale]/components/EditUserForm.tsx
index 91430a35..f003fe8c 100644
--- a/frontend/app/[locale]/components/EditUserForm.tsx
+++ b/frontend/app/[locale]/components/EditUserForm.tsx
@@ -57,22 +57,27 @@ const EditUserForm = ({userId}: EditUserFormProps) => {
                     width: '100%',
                 }}
             >
+                <Typography
+                    variant={'h3'}
+                    paddingBottom={2}
+                >
+                    {t("edit_user_details")}
+                </Typography>
                 <Box
                     height={'fit-content'}
                     mb={3}
                 >
                     <Typography
-                        variant="h3"
+                        variant="h4"
                     >
-                        {t("user email")}
+                        {t("email")}
                     </Typography>
                     <Typography
-                        variant="body1"
+                        variant={'body1'}
                         style={{
-                            fontSize: '20px',
-                            fontFamily: 'Quicksand, sans-serif',
+
                             borderRadius: '6px',
-                            height: '30px',
+                            height: 'fit-content',
                             width: '400px',
                             padding: '6px', // Add padding for better appearance
                             backgroundColor: '#f0f0f0', // Add background color for better contrast
@@ -86,16 +91,21 @@ const EditUserForm = ({userId}: EditUserFormProps) => {
                     mb={3}
                 >
                     <Typography
-                        variant="h3"
+                        variant="h4"
                     >
-                        {t("user first name")}
+                        {t("first name")}
                     </Typography>
-                    <TextField type="text" id="name" name="name" defaultValue={firstname}
-                        onChange={(event: any) => setFirstName(event.target.value)} required style={{
+                    <TextField
+                        type="text"
+                        id="name"
+                        name="name"
+                        defaultValue={firstname}
+                        onChange={(event: any) => setFirstName(event.target.value)}
+                        required
+                        style={{
                             fontSize: '20px',
-                            fontFamily: 'Quicksand, sans-serif',
                             borderRadius: '6px',
-                            height: '30px',
+                            height: 'fit-content',
                             width: '400px'
                         }} />
                 </Box>
@@ -104,16 +114,21 @@ const EditUserForm = ({userId}: EditUserFormProps) => {
                     mb={3}
                 >
                     <Typography
-                        variant="h3"
+                        variant="h4"
                     >
-                        {t("user last name")}
+                        {t("last name")}
                     </Typography>
-                    <TextField type="text" id="name" name="name" defaultValue={lastname}
-                        onChange={(event: any) => setLastName(event.target.value)} required style={{
+                    <TextField
+                        type="text"
+                        id="name"
+                        name="name"
+                        defaultValue={lastname}
+                        onChange={(event: any) => setLastName(event.target.value)}
+                        required
+                        style={{
                             fontSize: '20px',
-                            fontFamily: 'Quicksand, sans-serif',
                             borderRadius: '6px',
-                            height: '30px',
+                            height: 'fit-content',
                             width: '400px'
                         }} />
                 </Box>
@@ -122,7 +137,7 @@ const EditUserForm = ({userId}: EditUserFormProps) => {
                     mb={3}
                 >
                     <Typography
-                        variant="h3"
+                        variant="h4"
                     >
                         {t("role")}
                     </Typography>
@@ -131,9 +146,8 @@ const EditUserForm = ({userId}: EditUserFormProps) => {
                         onChange={(event: any) => setRole(event.target.value)}
                         style={{
                             fontSize: '20px',
-                            fontFamily: 'Quicksand, sans-serif',
                             borderRadius: '6px',
-                            height: '30px',
+                            height: 'fit-content',
                             width: '400px'
                         }}
                     >
@@ -147,22 +161,23 @@ const EditUserForm = ({userId}: EditUserFormProps) => {
                     sx={{ marginTop: '16px', gap: 2 }}
                 >
                     <Button
+                        variant="contained"
                         type="submit"
                         color={'primary'}
                         sx={{
                             width: 'fit-content',
-                            backgroundColor: 'primary.main',
                             color: 'primary.contrastText'
                         }}
                     >
                         {t("save changes")}
                     </Button>
                     <Button
+                        variant={'contained'}
                         href={'/admin/users'}
+                        color='secondary'
                         sx={{
                             width: 'fit-content',
-                            backgroundColor: 'secondary.main',
-                            color: 'secondary.contrastText'
+                            color: 'secondary.contrastText',
                         }}
                     >
                         {t("cancel")}
diff --git a/frontend/app/[locale]/components/ListView.tsx b/frontend/app/[locale]/components/ListView.tsx
index 93e822bd..34a49f0b 100644
--- a/frontend/app/[locale]/components/ListView.tsx
+++ b/frontend/app/[locale]/components/ListView.tsx
@@ -97,7 +97,10 @@ interface ListViewProps {
     search: boolean;
 }
 
-const convertDate = (date_str: string) => {
+const convertDate = (t, date_str) => {
+    if (date_str === null) {
+        return t('no_deadline');
+    }
     let date = new Date(date_str);
     date = new Date(date.getTime());
     let date_local = date.toLocaleString('en-US', {
@@ -172,7 +175,7 @@ const ListView: NextPage<ListViewProps> = ({
                     'course_students': (data) => [data.id, data.email],
                     'course_teachers': (data) => [data.id, data.email],
                     'courses': (data) => [data.course_id, data.name, data.description, data.open_course],
-                    'projects': (data) => [data.project_id, data.name, convertDate(data.deadline)],
+                    'projects': (data) => [data.project_id, data.name, convertDate(t, data.deadline)],
                     'groups': async (data) => {
                         let l = [];
                         // Iterate over the values of the object
@@ -186,8 +189,8 @@ const ListView: NextPage<ListViewProps> = ({
                         setGroupSize((await getProject(data.project_id)).group_size);
                         return [data.group_id, data.user, data.group_nr, l.join(', ')];
                     },
-                    'submissions': (data) => [data.submission_id, data.group_id, convertDate(data.timestamp), data.output_test !== undefined],
-                    'submissions_group': (data) => [data.submission_id, data.group_id, convertDate(data.timestamp), data.output_test !== undefined],
+                    'submissions': (data) => [data.submission_id, data.group_id, convertDate(t,data.timestamp), data.output_test !== undefined],
+                    'submissions_group': (data) => [data.submission_id, data.group_id, convertDate(t,data.timestamp), data.output_test !== undefined],
                     'archived_courses': (data) => [data.course_id, data.name, data.description, data.open_course],
                 };
 
@@ -499,7 +502,7 @@ const ListView: NextPage<ListViewProps> = ({
                             {rows.map((row, index) => (
                                 <StyledTableRow key={index}>
                                     {((get !== 'groups' && get !== 'projects' && get !== 'courses' && !(get === 'submissions' && !action_name) && get != 'users') &&
-                                        get !== 'course_teachers' && !(action_name && user?.role === 3 && get !== 'archived_courses') &&
+                                        get !== 'course_teachers' && !(action_name && user?.role === 3) && get !== 'archived_courses' &&
                                         <StyledTableCell>
                                             {<CheckBoxWithCustomCheck checked={false}/>}
                                         </StyledTableCell>)}
diff --git a/frontend/app/[locale]/components/ProjectDetailsPage.tsx b/frontend/app/[locale]/components/ProjectDetailsPage.tsx
index 32dbb595..d2374f8d 100644
--- a/frontend/app/[locale]/components/ProjectDetailsPage.tsx
+++ b/frontend/app/[locale]/components/ProjectDetailsPage.tsx
@@ -1,6 +1,6 @@
 'use client'
 import React, { useEffect, useState } from "react";
-import {checkGroup, getGroup, getProject, fetchUserData, Project, UserData} from "@lib/api";
+import {checkGroup, getGroup, getProject, getUserData, Project, UserData} from "@lib/api";
 import { useTranslation } from "react-i18next";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
@@ -154,22 +154,37 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
                         />
                     ))) : (
                   <>
-                    {user?.role !== 3 && (
-                        <Button
-                            variant="contained"
-                            color="secondary"
-                            startIcon={<EditIcon />}
-                            href={`/${locale}/project/${project_id}/edit`}
-                            sx={{
-                              fontSize: "0.75rem",
-                              py: 1,
-                              marginRight: 1,
-                              marginY: 1,
-                            }}
-                        >
-                          {t("edit_project")}
-                        </Button>
-                    )}
+                      {user?.role !== 3 && (
+                          <>
+                              <Button
+                                  variant="contained"
+                                  color="secondary"
+                                  href={`/${locale}/project/${project_id}/submissions`}
+                                  sx={{
+                                      fontSize: "0.75rem",
+                                      py: 1,
+                                      marginRight: 1,
+                                      marginY: 1,
+                                  }}
+                              >
+                                  {t("submissions")}
+                              </Button>
+                              <Button
+                                  variant="contained"
+                                  color="secondary"
+                                  startIcon={<EditIcon />}
+                                  href={`/${locale}/project/${project_id}/edit`}
+                                  sx={{
+                                      fontSize: "0.75rem",
+                                      py: 1,
+                                      marginRight: 1,
+                                      marginY: 1,
+                                  }}
+                              >
+                                  {t("edit_project")}
+                              </Button>
+                          </>
+                      )}
                     <Button
                         variant="contained"
                         color="secondary"
@@ -287,6 +302,10 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
 
 function buildTree(paths) {
     const tree = {};
+    if (!paths) {
+        return tree;
+    }
+
     const paths_list = paths.split(',');
     paths_list.forEach(path => {
         const parts = path.split('/');
diff --git a/frontend/app/[locale]/components/StatusButton.tsx b/frontend/app/[locale]/components/StatusButton.tsx
index 888c6599..49ef4eb0 100644
--- a/frontend/app/[locale]/components/StatusButton.tsx
+++ b/frontend/app/[locale]/components/StatusButton.tsx
@@ -33,10 +33,13 @@ function StatusButton(
     <Button
       variant="contained"
       onClick={handleClick}
-      style={{
+      sx={{
           border: 'none',
           backgroundColor: 'transparent',
-          margin: 10,
+          minWidth: '30px',  // Ensure the button is square by setting equal width and height
+          minHeight: '30px',  // Adjust the size as needed
+          padding: 0,
+          margin: 1,
       }}
     >
       {statuses[statusIndex].icon}
diff --git a/frontend/app/[locale]/components/SubmissionDetailsPage.tsx b/frontend/app/[locale]/components/SubmissionDetailsPage.tsx
index a8b1a1d1..14f5927b 100644
--- a/frontend/app/[locale]/components/SubmissionDetailsPage.tsx
+++ b/frontend/app/[locale]/components/SubmissionDetailsPage.tsx
@@ -12,12 +12,12 @@ import DownloadIcon from "@mui/icons-material/CloudDownload";
 
 const backend_url = process.env['NEXT_PUBLIC_BACKEND_URL'];
 
-interface ProjectDetailsPageProps {
+interface SubmissionDetailsPageProps {
     locale: any,
     submission_id: number;
 }
 
-const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({ locale, submission_id }) => {
+const SubmissionDetailsPage: React.FC<SubmissionDetailsPageProps> = ({ locale, submission_id }) => {
     const { t } = useTranslation();
 
     const [submission, setSubmission] = useState<Submission>();
@@ -67,7 +67,7 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({ locale, submiss
         <ThemeProvider theme={baseTheme}>
             <Grid container justifyContent="center" alignItems="flex-start" style={{ width: '100%', padding: '20px' }}>
                 <Grid item xs={12} style={{paddingBottom: '20px'}}>
-                    <ProjectReturnButton locale={locale} project_id={project?.project_id} />
+                    <ProjectReturnButton locale={locale} project_id={projectId} />
                 </Grid>
                 <Grid item xs={12}>
                     <Card raised style={{ width: '100%' }}>
@@ -107,7 +107,7 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({ locale, submiss
                                         startIcon={<DownloadIcon />}
                                         href={`${backend_url}/submissions/${submission_id}/download`}
                                         download
-                                        size="small" // Adjust button size
+                                        size="small"
                                     >
                                         {t("download_file")}
                                     </Button>
@@ -121,4 +121,4 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({ locale, submiss
     );
 };
 
-export default ProjectDetailsPage;
+export default SubmissionDetailsPage;
diff --git a/frontend/app/[locale]/components/general/RequiredFilesList.tsx b/frontend/app/[locale]/components/general/RequiredFilesList.tsx
index e795b6db..5cd34792 100644
--- a/frontend/app/[locale]/components/general/RequiredFilesList.tsx
+++ b/frontend/app/[locale]/components/general/RequiredFilesList.tsx
@@ -1,10 +1,11 @@
 "use client"
 
-import {Button, IconButton, List, ListItem, ListItemText, TextField, Typography} from "@mui/material";
+import {Button, IconButton, List, ListItem, ListItemText, Tooltip, TextField, Typography} from "@mui/material";
 import DeleteIcon from "@mui/icons-material/Delete";
 import React, {useState} from "react";
 import Box from "@mui/material/Box";
 import StatusButton from "@app/[locale]/components/StatusButton";
+import {useTranslation} from "react-i18next";
 
 interface ItemsListProps {
     items: string[],
@@ -27,6 +28,7 @@ const ItemsList = ({
                    }: ItemsListProps) => {
     const [newItem, setNewItem] = useState('')
     const [noInput, setNoInput] = useState(false)
+    const {t} = useTranslation();
 
     const handleDelete = (index: number) => {
         const newFields = [...items];
@@ -66,10 +68,10 @@ const ItemsList = ({
                 >
                     {items.map((field, index) => (
                         <ListItem
+                            disablePadding={true}
                             key={index}
                             secondaryAction={
                                 <div>
-                                    <StatusButton files={items_status} setFiles={setItemsStatus} fileIndex={index}/>
                                     <IconButton
                                         edge="end"
                                         aria-label="delete"
@@ -80,6 +82,11 @@ const ItemsList = ({
                                 </div>
                             }
                         >
+                            <Tooltip title={t("status_button_tooltip")} placement="top">
+                                <div style={{ display: 'flex', alignItems: 'center' }}>
+                                    <StatusButton files={items_status} setFiles={setItemsStatus} fileIndex={index} />
+                                </div>
+                            </Tooltip>
                             <ListItemText
                                 primary={field}
                             />
diff --git a/frontend/app/[locale]/components/user_components/DeleteButton.tsx b/frontend/app/[locale]/components/user_components/DeleteButton.tsx
index 22213f83..390c9f59 100644
--- a/frontend/app/[locale]/components/user_components/DeleteButton.tsx
+++ b/frontend/app/[locale]/components/user_components/DeleteButton.tsx
@@ -38,7 +38,11 @@ const DeleteButton = ({ userId }: DeleteButtonProps) => {
                     whiteSpace: 'nowrap',
                 }}
             >
-                {t("delete user")}
+                <Typography
+                    paddingX={3}
+                >
+                    {t("delete user")}
+                </Typography>
             </Button>
             <Dialog
                 open={open}
diff --git a/frontend/app/[locale]/course/[course_id]/students/page.tsx b/frontend/app/[locale]/course/[course_id]/students/page.tsx
index e8367485..0f6a9dc7 100644
--- a/frontend/app/[locale]/course/[course_id]/students/page.tsx
+++ b/frontend/app/[locale]/course/[course_id]/students/page.tsx
@@ -8,6 +8,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import React, {useEffect, useState} from "react";
 import EmailIcon from '@mui/icons-material/Email';
 import {fetchUserData, UserData} from "@lib/api";
+import Typography from "@mui/material/Typography";
 
 const i18nNamespaces = ['common']
 
@@ -69,6 +70,16 @@ export default function StudentsPage({params: {locale, course_id}}: { params: {
                     >
                         {translations.t('back_to') + ' ' + translations.t('course') + ' ' + translations.t('page')}
                     </Button>
+                    <Typography
+                        variant="h3"
+                        sx={{
+                            fontWeight: 'medium',
+                            marginTop: 2,
+                            marginBottom: 2
+                        }}
+                    >
+                        {translations.t('students')}
+                    </Typography>
                     <Box marginTop={{ xs: 2, md: 4 }}>
                         <ListView
                             admin={true}
diff --git a/frontend/app/[locale]/course/[course_id]/teachers/page.tsx b/frontend/app/[locale]/course/[course_id]/teachers/page.tsx
index 730e203e..8d792930 100644
--- a/frontend/app/[locale]/course/[course_id]/teachers/page.tsx
+++ b/frontend/app/[locale]/course/[course_id]/teachers/page.tsx
@@ -8,6 +8,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import React, {useEffect, useState} from "react";
 import EmailIcon from '@mui/icons-material/Email';
 import {fetchUserData, UserData} from "@lib/api";
+import Typography from "@mui/material/Typography";
 
 const i18nNamespaces = ['common']
 
@@ -68,6 +69,16 @@ export default function TeachersPage({params: {locale, course_id}}: { params: {
                     >
                         {translations.t('back_to') + ' ' + translations.t('course') + ' ' + translations.t('page')}
                     </Button>
+                    <Typography
+                        variant="h3"
+                        sx={{
+                            fontWeight: 'medium',
+                            marginTop: 2,
+                            marginBottom: 2
+                        }}
+                    >
+                        {translations.t('teachers')}
+                    </Typography>
                     <Box marginTop={{ xs: 2, md: 4 }}>
                     <ListView
                         admin={true}
diff --git a/frontend/app/[locale]/course/all/page.tsx b/frontend/app/[locale]/course/all/page.tsx
index c7a556aa..2ecd2982 100644
--- a/frontend/app/[locale]/course/all/page.tsx
+++ b/frontend/app/[locale]/course/all/page.tsx
@@ -7,6 +7,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import {Box, Button} from "@mui/material";
 import NotesIcon from '@mui/icons-material/Notes';
 import MeetingRoomIcon from '@mui/icons-material/MeetingRoom';
+import Typography from "@mui/material/Typography";
 
 
 const i18nNamespaces = ['common']
@@ -36,6 +37,16 @@ export default async function AllCoursesPage({params: {locale}}: { params: { loc
                 >
                     {t('back_to') + ' ' + t('home') + ' ' + t('page')}
                 </Button>
+                <Typography
+                        variant="h3"
+                        sx={{
+                            fontWeight: 'medium',
+                            marginTop: 2,
+                            marginBottom: 2
+                        }}
+                    >
+                        {t('courses_all')}
+                    </Typography>
                 <ListView
                     admin={true}
                     headers={headers}
diff --git a/frontend/app/[locale]/course/archived/page.tsx b/frontend/app/[locale]/course/archived/page.tsx
index 61f163be..0efa1706 100644
--- a/frontend/app/[locale]/course/archived/page.tsx
+++ b/frontend/app/[locale]/course/archived/page.tsx
@@ -5,6 +5,7 @@ import initTranslations from "@app/i18n";
 import TranslationsProvider from "@app/[locale]/components/TranslationsProvider";
 import BackButton from "@app/[locale]/components/BackButton";
 import NotesIcon from '@mui/icons-material/Notes';
+import Typography from "@mui/material/Typography";
 
 const i18nNamespaces = ['common'];
 
@@ -12,7 +13,7 @@ const ArchivePage = async ({params: {locale}}) => {
     const {t, resources} = await initTranslations(locale, i18nNamespaces);
     const headers = [t('name'), 
     <React.Fragment key="description"><NotesIcon style={{ fontSize: '20px', verticalAlign: 'middle', marginBottom: '3px' }}/>{" " + t('description')}</React.Fragment>,
-    , t('open'), ''];
+    , t('open')];
     const headers_backend = ['name', 'description', 'open'];
 
     return (
@@ -32,6 +33,16 @@ const ArchivePage = async ({params: {locale}}) => {
                     destination={'/home'}
                     text={t('back_to') + ' ' + t('home') + ' ' + t('page')}
                 />
+                <Typography
+                    variant="h3"
+                    sx={{
+                        fontWeight: 'medium',
+                        marginTop: 2,
+                        marginBottom: 2
+                    }}
+                >
+                    {t('courses_archive')}
+                </Typography>
                 <ListView
                     admin={true}
                     headers={headers}
diff --git a/frontend/app/[locale]/project/[project_id]/groups/page.tsx b/frontend/app/[locale]/project/[project_id]/groups/page.tsx
index f6e36ec2..2d68c4f2 100644
--- a/frontend/app/[locale]/project/[project_id]/groups/page.tsx
+++ b/frontend/app/[locale]/project/[project_id]/groups/page.tsx
@@ -7,6 +7,8 @@ import { Button, Box } from "@mui/material";
 import React from "react";
 import GroupsIcon from '@mui/icons-material/Groups';
 import MeetingRoomIcon from '@mui/icons-material/MeetingRoom';
+import Typography from "@mui/material/Typography";
+
 
 const i18nNamespaces = ['common']
 
@@ -36,6 +38,16 @@ export default async function GroupPage({ params }: { params: { locale: any, pro
                 >
                     {t("return_project")}
                 </Button>
+                <Typography
+                    variant="h3"
+                    sx={{
+                        fontWeight: 'medium',
+                        marginTop: 2,
+                        marginBottom: 2
+                    }}
+                >
+                    {t('groups')}
+                </Typography>
                 <ListView
                     admin={true}
                     headers={headers}
diff --git a/frontend/app/[locale]/project/[project_id]/submissions/page.tsx b/frontend/app/[locale]/project/[project_id]/submissions/page.tsx
new file mode 100644
index 00000000..0d1c8694
--- /dev/null
+++ b/frontend/app/[locale]/project/[project_id]/submissions/page.tsx
@@ -0,0 +1,50 @@
+import initTranslations from "@app/i18n";
+import TranslationsProvider from "@app/[locale]/components/TranslationsProvider";
+import NavBar from "@app/[locale]/components/NavBar";
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import {Box, Button} from "@mui/material";
+import React from "react";
+import ProjectSubmissionsList from "@app/[locale]/components/ProjectSubmissionsList";
+import Typography from "@mui/material/Typography";
+
+const i18nNamespaces = ['common']
+
+export default async function SubmissionsPage({params}: { params: { locale: any, project_id: number } }) {
+    const {locale, project_id: projectId} = params;
+    const {t, resources} = await initTranslations(locale, i18nNamespaces);
+
+    return (
+        <TranslationsProvider
+            resources={resources}
+            locale={locale}
+            namespaces={i18nNamespaces}
+        >
+            <NavBar/>
+            <Box width={'100%'} style={{padding: 20}}>
+                <Button
+                    variant="outlined"
+                    color="primary"
+                    startIcon={<ArrowBackIcon/>}
+                    href={`/${locale}/project/${projectId}`}
+                >
+                    {t("return_project")}
+                </Button>
+                <Typography
+                    variant="h3"
+                    sx={{
+                        fontWeight: 'medium',
+                        marginTop: 2,
+                        marginBottom: 2
+                    }}
+                >
+                    {t('all_submissions')}
+                </Typography>
+                <ProjectSubmissionsList
+                    project_id={projectId}
+                    page_size={10}
+                    search={t("submission_search")}
+                />
+            </Box>
+        </TranslationsProvider>
+    );
+}
diff --git a/frontend/locales/en/common.json b/frontend/locales/en/common.json
index 4730716c..5ade4b3a 100644
--- a/frontend/locales/en/common.json
+++ b/frontend/locales/en/common.json
@@ -76,6 +76,7 @@
   "role": "Role",
   "save changes": "Save changes",
   "save course": "Save course",
+  "edit course": "Edit course",
   "save": "Save",
   "save_changes": "Save Changes",
   "score_required": "Score is required",
@@ -122,8 +123,8 @@
   "search_teacher": "Search teacher",
   "Are you sure you want to delete this user?": "Are you sure you want to delete this user?",
   "delete user": "Delete user",
-  "user first name": "First name of user",
-  "user last name": "Last name of user",
+  "first name": "First name",
+  "last name": "Surname",
   "user email": "Email of user",
   "Are you sure you want to submit this course?": "Are you sure you want to submit this course?",
   "ERROR_NOT_IN_GROUP": "You're not in a group",
@@ -138,5 +139,14 @@
   "join/leave": "Join/Leave",
   "group_nr": "Group nr",
   "join_leave": "Join/Leave",
-  "not_in_group": "Join a group to submit"
+  "not_in_group": "Join a group to submit",
+  "edit_user_details": "Edit user details",
+  "status_button_tooltip": "Required, optional or forbidden file",
+  "no_deadline": "No deadline",
+  "all_submissions": "All submissions",
+  "students": "Students",
+  "teachers": "Teachers",
+  "courses_archive": "Courses archive",
+  "courses_all": "All courses",
+  "open": "Open"
 }
\ No newline at end of file
diff --git a/frontend/locales/nl/common.json b/frontend/locales/nl/common.json
index 16a66b81..778fefc7 100644
--- a/frontend/locales/nl/common.json
+++ b/frontend/locales/nl/common.json
@@ -76,6 +76,7 @@
   "role": "Rol",
   "save changes": "Wijzigingen opslaan",
   "save course": "Cursus opslaan",
+  "edit course": "Cursus bewerken",
   "save": "Opslaan",
   "save_changes": "Wijzigingen Opslaan",
   "score_required": "Score is verplicht",
@@ -122,8 +123,8 @@
   "search_teacher": "Zoek docent",
   "Are you sure you want to delete this user?": "Ben je zeker dat je deze gebruiker wil verwijderen?",
   "delete user": "Verwijder gebruiker",
-  "user first name": "Voornaam gebruiker",
-  "user last name": "Achternaam gebruiker",
+  "first name": "Voornaam",
+  "last name": "Achternaam",
   "user email": "Gebruiker email",
   "Are you sure you want to submit this course?": "Ben je zeker dat je deze cursus wil aanmaken?",
   "year": "Jaargang",
@@ -141,5 +142,14 @@
   "join/leave": "Toetreden/Verlaten",
   "group_nr": "Groep nr",
   "join_leave": "Toetreden/Verlaten",
-  "not_in_group": "Je kan niet indienen zonder in een groep te zitten"
+  "not_in_group": "Je kan niet indienen zonder in een groep te zitten",
+  "edit_user_details": "Gebruiker bewerken",
+  "status_button_tooltip": "Verplicht, optioneel of verboden bestand",
+  "no_deadline": "Geen deadline",
+  "all_submissions": "Alle indieningen",
+  "students": "Studenten",
+  "teachers": "Docenten",
+  "courses_archive": "Gearchiveerde cursussen",
+  "courses_all": "Alle cursussen",
+  "open": "Open"
 }
\ No newline at end of file
diff --git a/scripts/mockdata.py b/scripts/mockdata.py
index 6badc6b5..0a3df480 100644
--- a/scripts/mockdata.py
+++ b/scripts/mockdata.py
@@ -272,6 +272,7 @@ def run():
         description=lorem_ipsum,
         course_id=course_5,
         deadline='2021-12-12 12:12:14',
+        file_structure='+src/*.py,+extra/verslag.pdf',
         visible=True,
         number_of_groups=1,
         group_size=8
@@ -305,7 +306,8 @@ def run():
         deadline='2021-12-12 12:12:14',
         visible=True,
         number_of_groups=10,
-        group_size=2
+        group_size=2,
+        file_structure='+extra/verslag.pdf,+src/*.py'
     )
 
     # Create groups
@@ -400,55 +402,55 @@ def run():
     Submissions.objects.get_or_create(
         group_id=group_1,
         submission_nr=1,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:12'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_1,
         submission_nr=2,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:13'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_1,
         submission_nr=3,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:15'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_1,
         submission_nr=4,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:16'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_2,
         submission_nr=1,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:12'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_3,
         submission_nr=1,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:13'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_4,
         submission_nr=1,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:15'
     )
 
     Submissions.objects.get_or_create(
         group_id=group_5,
         submission_nr=1,
-        file_urls=lorem_ipsum_file,
+        file_urls='src/main.py, extra/verslag.pdf',
         timestamp='2021-12-12 12:12:16'
     )