diff --git a/frontend/__test__/project/edit/Requiredfiles.test.tsx b/frontend/__test__/project/edit/Requiredfiles.test.tsx
index 8565ce27..8ba02667 100644
--- a/frontend/__test__/project/edit/Requiredfiles.test.tsx
+++ b/frontend/__test__/project/edit/Requiredfiles.test.tsx
@@ -15,7 +15,7 @@ describe('Requiredfiles', () => {
                 files={["First", "Second"]}
                 setFiles={jest.fn()}
                 translations={translations.en}
-            />
+             file_status={["+", "-"]} setFileStatus={jest.fn()}/>
         );
 
         // check that the required files were rendered properly
diff --git a/frontend/app/[locale]/components/CourseControls.tsx b/frontend/app/[locale]/components/CourseControls.tsx
index cd86fe99..a7d097a9 100644
--- a/frontend/app/[locale]/components/CourseControls.tsx
+++ b/frontend/app/[locale]/components/CourseControls.tsx
@@ -73,11 +73,14 @@ const CourseControls = ({selectedYear, onYearChange}) => {
                             {t("view_archive")}
                         </Button>
                     </Link>
-                    <Link href="/admin/users" passHref>
-                        <Button variant="contained" color="secondary" startIcon={<SupervisorAccountIcon/>}>
-                            {t("site users")}
-                        </Button>
-                    </Link>
+                    {user?.role === 1 ? (
+                        <Link href="/admin/users" passHref>
+                            <Button variant="contained" color="secondary" startIcon={<SupervisorAccountIcon/>}>
+                                {t("site users")}
+                            </Button>
+                        </Link>
+                    ) : null
+                    }
                     <Select
                         value={selectedYear}
                         onChange={onYearChange}
diff --git a/frontend/app/[locale]/components/ProjectDetailsPage.tsx b/frontend/app/[locale]/components/ProjectDetailsPage.tsx
index cbd9aba1..d0578790 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 { getProject, getUserData, 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";
@@ -36,6 +36,7 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
   const [loadingProject, setLoadingProject] = useState<boolean>(true);
   const [user, setUser] = useState<UserData | null>(null);
   const [isExpanded, setIsExpanded] = useState(false);
+  const [isInGroup, setIsInGroup] = useState(false);
   const previewLength = 300;
   const deadlineColorType = project?.deadline
     ? checkDeadline(project.deadline)
@@ -66,6 +67,7 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
     };
 
     fetchProject().then(() => setLoadingProject(false));
+    checkGroup(project_id).then((response) => setIsInGroup(response));
   }, [project_id]);
 
   if (loadingProject) {
@@ -98,7 +100,7 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
   return (
     <ThemeProvider theme={baseTheme}>
       <Box style={{ padding: "16px", maxWidth: "100%" }}>
-        <Grid container spacing={2} alignItems="center">
+        <Grid container spacing={2} alignItems="flex-end">
           <Grid item xs={12}>
             <Button
               variant="outlined"
@@ -108,33 +110,37 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
             >
               {t("return_course")}
             </Button>
-            <Grid container alignItems="center" spacing={2} sx={{ my: 1 }}>
+            <Grid container spacing={2} sx={{ my: 1 }}>
               <Grid item xs={12} sm={6}>
                 <Typography variant="h4">{project?.name}</Typography>
               </Grid>
-              {user?.role !== 3 && (
-                <Grid item xs={6} sm={3}>
-                  <Button
-                    variant="contained"
-                    color="secondary"
-                    startIcon={<EditIcon />}
-                    href={`/${locale}/project/${project_id}/edit`}
-                    sx={{ fontSize: "0.75rem", py: 1 }}
-                  >
-                    {t("edit_project")}
-                  </Button>
-                </Grid>
-              )}
-              <Grid item xs={6} sm={3}>
-                <Button
-                  variant="contained"
-                  color="secondary"
-                  startIcon={<GroupIcon />}
-                  href={`/${locale}/project/${project_id}/groups`}
-                  sx={{ fontSize: "0.75rem", py: 1 }}
-                >
-                  {t("groups")}
-                </Button>
+              <Grid item xs={12} sm={6} justifyContent="flex-end">
+                <Box sx={{ float: 'right', display: 'flex' }}>
+                  {user?.role !== 3 && (
+                    <Grid item xs={6} sm={6}>
+                      <Button
+                        variant="contained"
+                        color="secondary"
+                        startIcon={<EditIcon />}
+                        href={`/${locale}/project/${project_id}/edit`}
+                        sx={{ fontSize: '0.75rem', py: 1, marginRight: '2rem' }}
+                      >
+                        {t('edit_project')}
+                      </Button>
+                    </Grid>
+                  )}
+                  <Grid item xs={6} sm={6}>
+                    <Button
+                      variant="contained"
+                      color="secondary"
+                      startIcon={<GroupIcon />}
+                      href={`/${locale}/project/${project_id}/groups`}
+                      sx={{ fontSize: '0.75rem', py: 1 }}
+                    >
+                      {t('groups')}
+                    </Button>
+                  </Grid>
+                </Box>
               </Grid>
             </Grid>
             <Divider style={{ marginBottom: "1rem" }} />
@@ -197,15 +203,21 @@ const ProjectDetailsPage: React.FC<ProjectDetailsPageProps> = ({
               </Typography>
             </div>
             {user?.role === 3 ? (
-              <Button
-                variant="contained"
-                color="primary"
-                startIcon={<AddIcon />}
-                href={`/${locale}/project/${project_id}/submit`}
-                sx={{ my: 1 }}
-              >
-                {t("add_submission")}
-              </Button>
+              isInGroup ? (
+                  <Button
+                    variant="contained"
+                    color="primary"
+                    startIcon={<AddIcon />}
+                    href={`/${locale}/project/${project_id}/submit`}
+                    sx={{ my: 1 }}
+                  >
+                    {t("add_submission")}
+                  </Button>
+              ) : (
+                    <Typography variant="body1" style={{ color: "red", marginTop: "5px" }}>
+                        {t("not_in_group")}
+                    </Typography>
+              )
             ) : null}
           </Grid>
           <Grid item xs={12}>
diff --git a/frontend/app/[locale]/components/StatusButton.tsx b/frontend/app/[locale]/components/StatusButton.tsx
new file mode 100644
index 00000000..c809017c
--- /dev/null
+++ b/frontend/app/[locale]/components/StatusButton.tsx
@@ -0,0 +1,57 @@
+import {ClearIcon } from '@mui/x-date-pickers/icons';
+import React, { useState } from 'react';
+import CheckIcon from "@mui/icons-material/Check";
+import {Button, Typography} from "@mui/material";
+import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
+
+interface StatusButtonProps {
+    files: any[],
+    setFiles: (value: (((prevState: any[]) => any[]) | any[])) => void,
+    fileIndex: number,
+}
+
+function StatusButton(
+    {files, setFiles, fileIndex}: StatusButtonProps,
+) {
+  const [statusIndex, setStatusIndex] = useState(getStart(files[fileIndex]));
+  const statuses = [
+    { icon: <CheckIcon style={{ color: '#66bb6a' }} /> },
+    { icon: <HelpOutlineIcon style={{ color: '#000000' }} />},
+    { icon: <ClearIcon style={{ color: '#ef5350' }} /> },
+  ];
+  const status_valeus = ['+', '~', '-'];
+
+  const handleClick = () => {
+      const newStatusIndex = (statusIndex + 1) % statuses.length;
+      setStatusIndex(newStatusIndex);
+      const newFiles = [...files];
+      newFiles[fileIndex] = status_valeus[newStatusIndex];
+      setFiles(newFiles);
+  };
+
+  return (
+    <Button
+      variant="contained"
+      onClick={handleClick}
+      style={{
+          border: 'none',
+          backgroundColor: 'transparent',
+          margin: 10,
+      }}
+    >
+      {statuses[statusIndex].icon}
+    </Button>
+  );
+}
+
+function getStart(file: string) {
+  if (file[0] === '+') {
+    return 0;
+  } else if (file[0] === '~') {
+    return 1;
+  } else {
+    return 2;
+  }
+}
+
+export default StatusButton;
\ No newline at end of file
diff --git a/frontend/app/[locale]/components/SubmitDetailsPage.tsx b/frontend/app/[locale]/components/SubmitDetailsPage.tsx
index fc3fdb1b..f8ffab64 100644
--- a/frontend/app/[locale]/components/SubmitDetailsPage.tsx
+++ b/frontend/app/[locale]/components/SubmitDetailsPage.tsx
@@ -46,6 +46,7 @@ const SubmitDetailsPage: React.FC<SubmitDetailsPageProps> = ({
   const [submitted, setSubmitted] = useState<string>('no');
   const [loadingProject, setLoadingProject] = useState<boolean>(true);
   const [isExpanded, setIsExpanded] = useState(false);
+  const [disabled, setDisabled] = useState<boolean>(true);
   const previewLength = 300;
 
   const toggleDescription = () => {
@@ -89,6 +90,7 @@ const SubmitDetailsPage: React.FC<SubmitDetailsPageProps> = ({
       result = [...filepaths, ...newpaths];
     }
     setPaths(result);
+    setDisabled(newpaths.length === 0)
   }
 
   if (loadingProject) {
@@ -187,7 +189,13 @@ const SubmitDetailsPage: React.FC<SubmitDetailsPageProps> = ({
                   </Box>
                 )}
                 {submitted !== 'ok' && (
-                  <Button variant="contained" color="primary" startIcon={<PublishIcon />} type="submit">
+                  <Button
+                      variant="contained"
+                      color="primary"
+                      startIcon={<PublishIcon />}
+                      type="submit"
+                      disabled={disabled}
+                  >
                     {t('submit')}
                   </Button>
                 )}
diff --git a/frontend/app/[locale]/components/general/RequiredFilesList.tsx b/frontend/app/[locale]/components/general/RequiredFilesList.tsx
index e2564ed1..8739bb8d 100644
--- a/frontend/app/[locale]/components/general/RequiredFilesList.tsx
+++ b/frontend/app/[locale]/components/general/RequiredFilesList.tsx
@@ -1,19 +1,30 @@
 "use client"
 
-import {IconButton, List, ListItem, ListItemText, TextField, Typography, Button} from "@mui/material";
+import {Button, IconButton, List, ListItem, ListItemText, 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";
 
 interface ItemsListProps {
     items: string[],
     setItems: (value: (((prevState: any[]) => any[]) | any[])) => void,
     input_placeholder: string,
-    empty_list_placeholder:string,
-    button_text: string
+    empty_list_placeholder: string,
+    button_text: string,
+    items_status: string[],
+    setItemsStatus: (value: (((prevState: any[]) => any[]) | any[])) => void,
 }
 
-const ItemsList = ({items, setItems, input_placeholder, empty_list_placeholder, button_text}: ItemsListProps) => {
+const ItemsList = ({
+                       items,
+                       setItems,
+                       input_placeholder,
+                       empty_list_placeholder,
+                       button_text,
+                       items_status,
+                       setItemsStatus
+                   }: ItemsListProps) => {
     const [newItem, setNewItem] = useState('')
     const [noInput, setNoInput] = useState(false)
 
@@ -30,7 +41,6 @@ const ItemsList = ({items, setItems, input_placeholder, empty_list_placeholder,
             setItems(newItems);
             setNewItem('');
             setNoInput(false);
-            console.log(items);
         } else {
             setNoInput(true);
         }
@@ -39,7 +49,8 @@ const ItemsList = ({items, setItems, input_placeholder, empty_list_placeholder,
     return (
         <Box>
             {items.length === 0 ? (
-                <Typography variant={"body1"} color={"text.disabled"} sx={{padding: 1}}>{empty_list_placeholder}</Typography>
+                <Typography variant={"body1"} color={"text.disabled"}
+                            sx={{padding: 1}}>{empty_list_placeholder}</Typography>
             ) : (
                 <List
                     sx={{
@@ -54,13 +65,16 @@ const ItemsList = ({items, setItems, input_placeholder, empty_list_placeholder,
                         <ListItem
                             key={index}
                             secondaryAction={
-                                <IconButton
-                                    edge="end"
-                                    aria-label="delete"
-                                    onClick={() => handleDelete(index)}
-                                >
-                                    <DeleteIcon />
-                                </IconButton>
+                                <div>
+                                    <StatusButton files={items_status} setFiles={setItemsStatus} fileIndex={index}/>
+                                    <IconButton
+                                        edge="end"
+                                        aria-label="delete"
+                                        onClick={() => handleDelete(index)}
+                                    >
+                                        <DeleteIcon/>
+                                    </IconButton>
+                                </div>
                             }
                         >
                             <ListItemText
diff --git a/frontend/app/[locale]/components/project_components/requiredFiles.tsx b/frontend/app/[locale]/components/project_components/requiredFiles.tsx
index 75fc62d8..cea2a229 100644
--- a/frontend/app/[locale]/components/project_components/requiredFiles.tsx
+++ b/frontend/app/[locale]/components/project_components/requiredFiles.tsx
@@ -5,16 +5,18 @@ import Tooltip from "@mui/material/Tooltip";
 import React, {useState} from "react";
 import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
 import Box from "@mui/material/Box";
-import ItemsList from "@app/[locale]/components/general/ItemsList";
 import {useTranslation} from "react-i18next";
+import RequiredFilesList from "@app/[locale]/components/general/RequiredFilesList";
 
 interface RequiredFilesProps {
     files: any[],
     setFiles: (value: (((prevState: any[]) => any[]) | any[])) => void,
+    file_status: any[],
+    setFileStatus: (value: (((prevState: any[]) => any[]) | any[])) => void,
 }
 
 function RequiredFiles(
-    {files, setFiles}: RequiredFilesProps
+    {files, setFiles, file_status, setFileStatus}: RequiredFilesProps
 ) {
     const {t} = useTranslation();
 
@@ -35,12 +37,14 @@ function RequiredFiles(
             </Tooltip>
         </Typography>
         <Box className={"conditionsBox"}>
-            <ItemsList
+            <RequiredFilesList
                 items={files}
                 setItems={setFiles}
                 input_placeholder={t("new_file_example")}
                 empty_list_placeholder={t("no_required_files")}
                 button_text={t("add")}
+                items_status={file_status}
+                setItemsStatus={setFileStatus}
             />
         </Box>
     </div>;
diff --git a/frontend/app/[locale]/project/[project_id]/edit/projectEditForm.tsx b/frontend/app/[locale]/project/[project_id]/edit/projectEditForm.tsx
index 79cd926a..3efaa934 100644
--- a/frontend/app/[locale]/project/[project_id]/edit/projectEditForm.tsx
+++ b/frontend/app/[locale]/project/[project_id]/edit/projectEditForm.tsx
@@ -33,6 +33,7 @@ interface ProjectEditFormProps {
 
 function ProjectEditForm({project_id, add_course_id}: ProjectEditFormProps) {
     const [files, setFiles] = useState<string[]>([]);
+    const [status_files, setStatusFiles] = useState<string[]>([]);
     const [title, setTitle] = useState('');
     const [description, setDescription] = useState('');
     const [groupAmount, setGroupAmount] = useState(1);
@@ -70,8 +71,10 @@ function ProjectEditForm({project_id, add_course_id}: ProjectEditFormProps) {
                     setDescription(project.description)
                     if (project.file_structure !== null) {
                         const file_structure = project.file_structure.split(",").map((item: string) => item.trim().replace(/"/g, ''));
-                        setFiles(file_structure);
-                        console.log(files);
+                        const file_structure_status = file_structure.map((item: string) => item[0]);
+                        const file_structure_name = file_structure.map((item: string) => item.substring(1));
+                        setFiles(file_structure_name);
+                        setStatusFiles(file_structure_status);
                     }
                     setGroupSize(project["group_size"])
                     setTitle(project["name"])
@@ -115,7 +118,7 @@ function ProjectEditForm({project_id, add_course_id}: ProjectEditFormProps) {
 
     async function setTestFiles(project: Project) {
         const zip = new JSZip();
-        console.log(project.test_files)
+
         const test_files_zip = await getTestFiles(project.test_files);
         const zipData = await zip.loadAsync(test_files_zip);
         const testfiles_name: string[] = [];
@@ -152,13 +155,15 @@ function ProjectEditForm({project_id, add_course_id}: ProjectEditFormProps) {
             const zipFileBlob = await zip.generateAsync({type: "blob"});
             const formData = new FormData();
             const zipFile = new File([zipFileBlob], "test_files.zip");
+
+            const required_files = files.map((item, index) => status_files[index] + item);
             formData.append("test_files", zipFile);
             formData.append("name", title);
             formData.append("description", description);
             formData.append("max_score", score.toString());
             formData.append("number_of_groups", groupAmount.toString());
             formData.append("group_size", groupSize.toString());
-            formData.append("file_structure", files.join(","));
+            formData.append("file_structure", required_files.join(","));
             formData.append("conditions", conditions.join(","));
             formData.append("visible", visible.toString());
             if (add_course_id < 0) {
@@ -233,7 +238,10 @@ function ProjectEditForm({project_id, add_course_id}: ProjectEditFormProps) {
                             description={description}/>
                         <RequiredFiles
                             files={files}
-                            setFiles={setFiles}/>
+                            setFiles={setFiles}
+                            file_status={status_files}
+                            setFileStatus={setStatusFiles}
+                        />
                         <Conditions
                             conditions={conditions}
                             setConditions={setConditions}/>
diff --git a/frontend/lib/api.ts b/frontend/lib/api.ts
index 92e61922..fe2f4c18 100644
--- a/frontend/lib/api.ts
+++ b/frontend/lib/api.ts
@@ -418,6 +418,11 @@ export async function getGroup(id: number): Promise<Group> {
     return (await getRequest(`/groups/${id}`));
 }
 
+export async function checkGroup(id: number) {
+    let response = await axios.get(backend_url + "/projects/" + id + "/get_group/", {withCredentials: true});
+    return response.status !== 404;
+}
+
 export async function getGroups(): Promise<Group[]> {
     return (await getListRequest('/groups'));
 }
diff --git a/frontend/locales/en/common.json b/frontend/locales/en/common.json
index a556edd0..4730716c 100644
--- a/frontend/locales/en/common.json
+++ b/frontend/locales/en/common.json
@@ -135,5 +135,8 @@
   "group_number": "Group number",
   "submission_date": "Submission date",
   "status": "Status",
-  "join/leave": "Join/Leave"
+  "join/leave": "Join/Leave",
+  "group_nr": "Group nr",
+  "join_leave": "Join/Leave",
+  "not_in_group": "Join a group to submit"
 }
\ No newline at end of file
diff --git a/frontend/locales/nl/common.json b/frontend/locales/nl/common.json
index 5bee265d..16a66b81 100644
--- a/frontend/locales/nl/common.json
+++ b/frontend/locales/nl/common.json
@@ -138,5 +138,8 @@
   "group_number": "Groep nummer",
   "submission_date": "Inleverdatum",
   "status": "Status",
-  "join/leave": "Toetreden/Verlaten"
+  "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"
 }
\ No newline at end of file
diff --git a/scripts/opdracht_bestand_leeg/leeg b/scripts/opdracht_bestand_leeg/leeg
new file mode 100644
index 00000000..e69de29b