diff --git a/examples/dev_environment/install.sh b/examples/dev_environment/install.sh
index a378b236..1949c482 100644
--- a/examples/dev_environment/install.sh
+++ b/examples/dev_environment/install.sh
@@ -9,15 +9,12 @@ python -m pip install --upgrade pip
 pip install jupyterhub jupyterlab
 
 echo "Installing grader_convert..."
-pip install -r ../../grader_convert/requirements.txt
-pip install --no-use-pep517 ../../grader_convert
+pip install ../../grader_convert
 
 echo "Installing grader_service..."
-pip install -r ../../grader_service/requirements.txt
-pip install --no-use-pep517 ../../grader_service
+pip install ../../grader_service
 
 echo "Installing grader_labextension..."
-#pip install -r ../../grader_labextension/requirements.txt
 pip install ../../grader_labextension # no development install for grader_labextension
 
 jupyter server extension enable grader_labextension
diff --git a/examples/dev_environment/jupyter_hub_config.py b/examples/dev_environment/jupyter_hub_config.py
index 10d7346e..0414ad89 100644
--- a/examples/dev_environment/jupyter_hub_config.py
+++ b/examples/dev_environment/jupyter_hub_config.py
@@ -15,7 +15,7 @@
 c.JupyterHub.authenticator_class = 'jupyterhub.auth.DummyAuthenticator'
 c.DummyAuthenticator.password = "admin"
 c.Authenticator.admin_users = {'user1'}
-c.Authenticator.allowed_users = {"user1", "user2", "user3"}
+c.Authenticator.allowed_users = {"user1", "user2", "user3", "user4", "user5", "user6", "user7"}
 
 ## simple setup
 c.JupyterHub.ip = '127.0.0.1'
@@ -31,7 +31,7 @@
 
 c.JupyterHub.load_groups = {
         "23wsle2:instructor": {'users': ["user1", "user2"]},
-        "23wsle2:student": {'users': ["user3"]},
+        "23wsle2:student": {'users': ["user3", "user4", "user5", "user6", "user7"]},
         "23wsle1:instructor": {'users': ["user1", "user2"]},
         "23wsle1:student": {'users': ["user3"]},
 }
diff --git a/grader_labextension/grader_labextension/handlers/assignment.py b/grader_labextension/grader_labextension/handlers/assignment.py
index 90914ace..56a14c38 100644
--- a/grader_labextension/grader_labextension/handlers/assignment.py
+++ b/grader_labextension/grader_labextension/handlers/assignment.py
@@ -185,16 +185,6 @@ async def delete(self, lecture_id: int, assignment_id: int):
         """
 
         try:
-            assignment = await self.request_service.request(
-                method="GET",
-                endpoint=f"{self.service_base_url}/lectures/{lecture_id}/assignments/{assignment_id}",
-                header=self.grader_authentication_header,
-            )
-            lecture = await self.request_service.request(
-                "GET",
-                f"{self.service_base_url}/lectures/{lecture_id}",
-                header=self.grader_authentication_header,
-            )
             await self.request_service.request(
                 method="DELETE",
                 endpoint=f"{self.service_base_url}/lectures/{lecture_id}/assignments/{assignment_id}",
@@ -202,11 +192,8 @@ async def delete(self, lecture_id: int, assignment_id: int):
                 decode_response=False
             )
         except HTTPClientError as e:
-            self.log.error(e.response)
             raise HTTPError(e.code, reason=e.response.reason)
-
-        self.log.warn(f'Deleting directory {self.root_dir}/{lecture["code"]}/assignments/{assignment["id"]}')
-        shutil.rmtree(os.path.expanduser(f'{self.root_dir}/{lecture["code"]}/assignments/{assignment["id"]}'), ignore_errors=True)
+            
         self.write("OK")
 
 
diff --git a/grader_labextension/grader_labextension/handlers/base_handler.py b/grader_labextension/grader_labextension/handlers/base_handler.py
index cfca7ece..8bf53f75 100644
--- a/grader_labextension/grader_labextension/handlers/base_handler.py
+++ b/grader_labextension/grader_labextension/handlers/base_handler.py
@@ -4,6 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 import functools
+from http.client import responses
 import json
 import traceback
 from typing import Optional, Awaitable
@@ -86,7 +87,7 @@ def grader_authentication_header(self):
 
     @property
     def user_name(self):
-        return self.current_user.name
+        return self.current_user['name']
 
     async def get_lecture(self, lecture_id) -> dict:
         try:
@@ -111,24 +112,23 @@ async def get_assignment(self, lecture_id, assignment_id):
         except HTTPClientError as e:
             self.log.error(e.response)
             raise HTTPError(e.code, reason=e.response.reason)
-
-    def write_error(self, status_code: int, **kwargs) -> None:
-        self.set_header('Content-Type', 'application/json')
-        self.set_status(status_code)
-        _, e, _ = kwargs.get("exc_info", (None, None, None))
-        error = httputil.responses.get(status_code, "Unknown")
-        reason = kwargs.get("reason", None)
-        if e and isinstance(e, HTTPError) and e.reason:
-            reason = e.reason
-        if self.settings.get("serve_traceback") and "exc_info" in kwargs:
-            # in debug mode, try to send a traceback
-            lines = []
-            for line in traceback.format_exception(*kwargs["exc_info"]):
-                lines.append(line)
-            self.finish(json.dumps(
-                ErrorMessage(status_code, error, self.request.path, reason,
-                             traceback=json.dumps(lines)).to_dict()))
-        else:
-            self.finish(json.dumps(ErrorMessage(status_code, error,
-                                                self.request.path,
-                                                reason).to_dict()))
+        
+    def write_error(self, status_code, **kwargs):
+            """APIHandler errors are JSON, not human pages"""
+            self.set_header("Content-Type", "application/json")
+            message = responses.get(status_code, "Unknown HTTP Error")
+            reply: dict = {
+                "message": message,
+            }
+            exc_info = kwargs.get("exc_info")
+            if exc_info:
+                e = exc_info[1]
+                if isinstance(e, HTTPError):
+                    reply["message"] = e.log_message or message
+                    reply["reason"] = e.reason
+                else:
+                    reply["message"] = "Unhandled error"
+                    reply["reason"] = None
+                    reply["traceback"] = "".join(traceback.format_exception(*exc_info))
+            self.log.warning("wrote error: %r", reply["message"], exc_info=True)
+            self.finish(json.dumps(reply))
\ No newline at end of file
diff --git a/grader_labextension/src/components/assignment/assignment.tsx b/grader_labextension/src/components/assignment/assignment.tsx
index 9c4ad895..c1e4f996 100644
--- a/grader_labextension/src/components/assignment/assignment.tsx
+++ b/grader_labextension/src/components/assignment/assignment.tsx
@@ -8,8 +8,8 @@ import * as React from 'react';
 import { Lecture } from '../../model/lecture';
 import { Assignment } from '../../model/assignment';
 import { Submission } from '../../model/submission';
-import { Box, Button, Chip, Stack, Tooltip, Typography } from '@mui/material';
-
+import { Box, Button, Chip, IconButton, Stack, Tooltip, Typography } from '@mui/material';
+import ReplayIcon from '@mui/icons-material/Replay';
 import { SubmissionList } from './submission-list';
 import { AssignmentStatus } from './assignment-status';
 import { Files } from './files/files';
@@ -51,6 +51,21 @@ const calculateActiveStep = (submissions: Submission[]) => {
   return 0;
 };
 
+interface ISubmissionsLeft{
+  subLeft: number;
+}
+const SubmissionsLeftChip = (props: ISubmissionsLeft) =>{
+  const output = props.subLeft + ' submission' + (props.subLeft === 1 ? ' left' : 's left'); 
+  return(
+    <Chip
+      sx={{ ml: 2 }}
+      size='medium'
+      icon={<WarningIcon />}
+      label={output}
+                      />
+  )
+}
+
 /**
  * Renders the components available in the extended assignment modal view
  */
@@ -79,14 +94,17 @@ export const AssignmentComponent = () => {
 
   /* Now we can divvy this into a useReducer  */
   const [allSubmissions, setSubmissions] = React.useState(submissions);
-
   const [files, setFiles] = React.useState([]);
   const [activeStatus, setActiveStatus] = React.useState(0);
+  const [subLeft, setSubLeft] = React.useState(0);
+
 
   React.useEffect(() => {
     getAllSubmissions(lecture.id, assignment.id, 'none', false).then(
       response => {
         setSubmissions(response);
+        if(assignment.max_submissions - response.length < 0) setSubLeft(0);
+        else setSubLeft(assignment.max_submissions - response.length);
       }
     );
     getFiles(path).then(files => {
@@ -149,6 +167,8 @@ export const AssignmentComponent = () => {
           response => {
             console.log('Submitted');
             setSubmissions([response, ...allSubmissions]);
+            if(subLeft - 1 < 0) setSubLeft(0);
+            else setSubLeft(subLeft - 1);
             enqueueSnackbar('Successfully Submitted Assignment', {
               variant: 'success'
             });
@@ -242,7 +262,11 @@ export const AssignmentComponent = () => {
     const scope = permissions[lecture.code];
     return scope >= Scope.tutor;
   };
+  const [reloadFilesToggle, setReloadFiles] = React.useState(false);
 
+  const reloadFiles = () => {
+    setReloadFiles(!reloadFilesToggle);
+  };
 
   return (
     <Box sx={{ flex: 1, overflow: 'auto' }}>
@@ -260,9 +284,16 @@ export const AssignmentComponent = () => {
           <DeadlineDetail due_date={assignment.due_date} late_submissions={assignment.settings.late_submission || []} />
         </Box>
         <Box sx={{ mt: 4 }}>
-          <Typography variant={'h6'} sx={{ ml: 2 }}>
+        <Stack direction={'row'} justifyContent={'flex-start'} alignItems={'center'} spacing={2} sx={{ ml: 2 }} >
+        <Typography variant={'h6'} sx={{ ml: 2 }}>
             Files
           </Typography>
+          <Tooltip title='Reload Files'>
+            <IconButton aria-label='reload' onClick={() => reloadFiles()}>
+              <ReplayIcon />
+            </IconButton>
+          </Tooltip>
+        </Stack>
           <Files
             lecture={lecture}
             assignment={assignment}
@@ -359,18 +390,24 @@ export const AssignmentComponent = () => {
       <Box sx={{ mt: 4 }}>
         <Typography variant={'h6'} sx={{ ml: 2, mt: 3 }}>
           Submissions
-          {assignment.max_submissions !== null ? (
-            <Chip
-              sx={{ ml: 2 }}
-              size='medium'
-              icon={<WarningIcon />}
-              label={
-                assignment.max_submissions -
-                submissions.length +
-                ' submissions left'
-              }
-            />
-          ) : null}
+          
+          { assignment.max_submissions !== null
+              ? ( hasPermissions()
+                  ? (
+                      <Stack direction={'row'}>
+                      <SubmissionsLeftChip subLeft={subLeft}/>
+                      <Chip sx={{ml: 2}}
+                       color="success" variant="outlined"
+                       label={'As instructor you have unlimited submissions'}/>
+                      </Stack>
+                    )
+                  : (
+                    <SubmissionsLeftChip subLeft={subLeft}/>
+                  )
+                )
+              : null
+          }
+
         </Typography>
         <SubmissionList
           submissions={allSubmissions}
diff --git a/grader_labextension/src/components/assignment/feedback.tsx b/grader_labextension/src/components/assignment/feedback.tsx
index a9ae78be..fb453474 100644
--- a/grader_labextension/src/components/assignment/feedback.tsx
+++ b/grader_labextension/src/components/assignment/feedback.tsx
@@ -60,7 +60,7 @@ export const Feedback = () => {
   }, [lecture, assignment, submission]);
 
   return (
-    <Box>
+    <Box sx={{overflow: 'auto'}}>
       <SectionTitle title={'Feedback for ' + assignment.name} />
       <Box sx={{ m: 2, mt: 12 }}>
         <Stack direction='row' spacing={2} sx={{ ml: 2 }}>
@@ -143,7 +143,8 @@ export const Feedback = () => {
         Feedback Files
       </Typography>
 
-      <FilesList path={path} sx={{ m: 2 }} />
+      <FilesList path={path} sx={{ m: 2, overflow: 'auto'}} />
+      
       <Stack direction={'row'} spacing={2} sx={{ m: 2 }}>
         <Button variant='outlined' component={Link as any} to={assignmentLink}>Back</Button>
         <Button
diff --git a/grader_labextension/src/components/assignment/files/files.tsx b/grader_labextension/src/components/assignment/files/files.tsx
index b985d9a7..18adc90b 100644
--- a/grader_labextension/src/components/assignment/files/files.tsx
+++ b/grader_labextension/src/components/assignment/files/files.tsx
@@ -35,7 +35,7 @@ export const Files = (
   openBrowser(path);
   return (
     <div>
-      <FilesList path={path} sx={{ m: 2, mt: 1 }} />
+      <FilesList path={path} sx={{ m: 2, mt: 1 }} lecture={props.lecture} shouldContain={props.files} assignment={props.assignment} />
     </div>
   );
 };
diff --git a/grader_labextension/src/components/coursemanage/files/files.tsx b/grader_labextension/src/components/coursemanage/files/files.tsx
index f2509b6e..b5bd5000 100644
--- a/grader_labextension/src/components/coursemanage/files/files.tsx
+++ b/grader_labextension/src/components/coursemanage/files/files.tsx
@@ -333,7 +333,7 @@ export const Files = (props: IFilesProps) => {
           <Tab label='Source' value='source' />
           <Tab label='Release' value='release' />
         </Tabs>
-        <Box height={200}>
+        <Box>
           <FilesList
             path={`${lectureBasePath}${props.lecture.code}/${selectedDir}/${props.assignment.id}`}
           />
diff --git a/grader_labextension/src/components/coursemanage/grading/edit-submission.tsx b/grader_labextension/src/components/coursemanage/grading/edit-submission.tsx
index 138c2fda..a4087afc 100644
--- a/grader_labextension/src/components/coursemanage/grading/edit-submission.tsx
+++ b/grader_labextension/src/components/coursemanage/grading/edit-submission.tsx
@@ -2,6 +2,10 @@ import { SectionTitle } from '../../util/section-title';
 import {
   Box,
   Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
   IconButton,
   Stack,
   Tooltip,
@@ -13,6 +17,7 @@ import { Assignment } from '../../../model/assignment';
 import { Submission } from '../../../model/submission';
 import {
   createOrOverrideEditRepository,
+  getLogs,
   getProperties,
   pullSubmissionFiles,
   pushSubmissionFiles,
@@ -52,6 +57,24 @@ export const EditSubmission = () => {
   const [submission, setSubmission] = React.useState(manualGradeSubmission);
   const [loading, setLoading] = React.useState(false);
 
+  const [showLogs, setShowLogs] = React.useState(false);
+  const [logs, setLogs] = React.useState(undefined);
+
+  const openLogs = (event: React.MouseEvent<unknown>, submissionId: number) => {
+    getLogs(lecture.id, assignment.id, submissionId).then(
+      logs => {
+        setLogs(logs);
+        setShowLogs(true);
+      },
+      error => {
+        enqueueSnackbar('No logs for submission', {
+          variant: 'error'
+        });
+      }
+    );
+    event.stopPropagation();
+  };
+
   const pushEditedFiles = async () => {
     await pushSubmissionFiles(lecture, assignment, submission).then(
       response => {
@@ -137,7 +160,17 @@ export const EditSubmission = () => {
           </Stack>
         </Stack>
       </Box>
+      <Stack direction = {'row'} justifyContent='space-between'>
       <Typography sx={{ m: 2, mb: 0 }}>Submission Files</Typography>
+      <Button
+        sx = {{mr: 2}}
+        variant='outlined'
+        size="small"
+        onClick={(event) => openLogs(event, manualGradeSubmission.id)}>
+          Show Logs
+        </Button>
+      </Stack>
+      
       <FilesList path={path} sx={{ m: 2 }} />
 
       <Stack direction={'row'} sx={{ ml: 2 }} spacing={2}>
@@ -191,6 +224,25 @@ export const EditSubmission = () => {
       <Toolbar>
         <Button variant='outlined' component={Link as any} to={submissionsLink}>Back</Button>
       </Toolbar>
+      <Dialog
+        open={showLogs}
+        onClose={() => setShowLogs(false)}
+        aria-labelledby='alert-dialog-title'
+        aria-describedby='alert-dialog-description'
+      >
+        <DialogTitle id='alert-dialog-title'>{'Logs'}</DialogTitle>
+        <DialogContent>
+          <Typography
+            id='alert-dialog-description'
+            sx={{ fontSize: 10, fontFamily: '\'Roboto Mono\', monospace' }}
+          >
+            {logs}
+          </Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setShowLogs(false)}>Close</Button>
+        </DialogActions>
+      </Dialog>
     </Stack>
   );
 };
diff --git a/grader_labextension/src/components/coursemanage/grading/manual-grading.tsx b/grader_labextension/src/components/coursemanage/grading/manual-grading.tsx
index c75631de..e74de0ee 100644
--- a/grader_labextension/src/components/coursemanage/grading/manual-grading.tsx
+++ b/grader_labextension/src/components/coursemanage/grading/manual-grading.tsx
@@ -1,8 +1,11 @@
 import { SectionTitle } from '../../util/section-title';
 import {
+  Alert,
+  AlertTitle,
   Box,
   Button, Checkbox, FormControlLabel,
   IconButton,
+  Modal,
   Stack, TextField,
   Tooltip,
   Typography
@@ -31,7 +34,55 @@ import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import { getAutogradeChip, getFeedbackChip, getManualChip } from './grading';
 import { autogradeSubmissionsDialog, generateFeedbackDialog } from './table-toolbar';
 import { showDialog } from '../../util/dialog-provider';
+import InfoIcon from '@mui/icons-material/Info';
 
+const style = {
+  position: 'absolute' as 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translate(-50%, -50%)',
+  width: '80%',
+  bgcolor: 'background.paper',
+  boxShadow: 3,
+  pt: 2,
+  px: 4,
+  pb: 3
+  
+};
+
+const InfoModal = () =>{
+  const [open, setOpen] = React.useState(false);
+  const handleOpen = () => {
+    setOpen(true);
+  };
+  const handleClose = () => {
+    setOpen(false);
+  };
+  return (
+    <React.Fragment>
+      <IconButton color="primary" onClick={handleOpen} sx={{mr: 2}}>
+          <InfoIcon/>
+      </IconButton>
+      <Modal
+        open={open}
+        onClose={handleClose}
+      >
+        <Box sx={{...style }}>
+          <h2>Manual Grading Information</h2>
+          <Alert severity="info" sx={{ m: 2 }}>
+            <AlertTitle>Info</AlertTitle>
+            If you want to manually grade an assignment, make sure to follow these steps: <br /><br />
+            1. &ensp; In order to grade a submission manually, the submission must first be auto-graded. This sets meta data for manual grading. However, we're actively working towards enabling direct manual grading without the necessity of auto-grading in the future.<br />
+            2. &ensp; Once the meta data was set for submission, you can pull the submission.<br />
+            3. &ensp; From file list access submission files and grade them manually.<br />
+            4. &ensp; After you've completed the grading of the submission, click "FINISH MANUAL GRADING." This action will save the grading and determine the points that the student receives for their submission.
+          </Alert>
+          <Button onClick={handleClose}>Close</Button>
+        </Box>
+      </Modal>
+    </React.Fragment>
+  );
+}
 
 export const ManualGrading = () => {
   const {
@@ -280,7 +331,13 @@ export const ManualGrading = () => {
           </Box>
         </Stack>
       </Box>
-      <Typography sx={{ m: 2, mb: 0 }}>Submission Files</Typography>
+
+      <Stack direction={'row'} justifyContent={'space-between'}>
+        <Typography sx={{ m: 2, mb: 0 }}>Submission Files</Typography>
+        <InfoModal/>
+      </Stack>
+      
+
       <FilesList path={manualPath} sx={{ m: 2 }} />
 
       <Stack direction={'row'} sx={{ ml: 2, mr: 2 }} spacing={2}>
@@ -289,7 +346,21 @@ export const ManualGrading = () => {
             <ReplayIcon />
           </IconButton>
         </Tooltip>
-
+        
+        {submission.auto_status !== 'automatically_graded' ?
+        <Tooltip title="Assinment is not auto-graded. To pull submission and finish manual grading, make sure to first autograde it.">
+              <Button
+                size={'small'}
+                variant='outlined'
+                color='primary'
+                onClick={handleAutogradeSubmission}
+                sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
+              >
+                Autograde
+              </Button>
+        </Tooltip>
+     
+        : null}
         <LoadingButton
           size={'small'}
           loading={loading}
@@ -310,6 +381,7 @@ export const ManualGrading = () => {
           size={'small'}
           variant='outlined'
           color='success'
+          disabled={submission.auto_status !== 'automatically_graded'}
           onClick={openFinishDialog}
           sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
         >
@@ -325,15 +397,19 @@ export const ManualGrading = () => {
           Edit Submission
         </Button>
         <Box sx={{ flex: '1 1 100%' }}></Box>
-        <Button
-          size={'small'}
-          variant='outlined'
-          color='primary'
-          onClick={handleAutogradeSubmission}
-          sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
-        >
-          Autograde
-        </Button>
+        {submission.auto_status === 'automatically_graded' ?
+              <Button
+              size={'small'}
+              variant='outlined'
+              color='primary'
+              onClick={handleAutogradeSubmission}
+              sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
+              >
+              Autograde
+              </Button>
+        : null}
+        
+        {submission.auto_status === 'automatically_graded' ?
         <Button
           size={'small'}
           variant='outlined'
@@ -343,8 +419,9 @@ export const ManualGrading = () => {
         >
           Generate Feedback
         </Button>
+        : null}
       </Stack>
-      <Box sx={{ flex: '1 1 100%' }}></Box>
+      <Box sx={{ flex: '1 1 100%', mt: 3 }}></Box>
       <Toolbar>
         <Button variant='outlined' component={Link as any} to={submissionsLink}>Back</Button>
         <Box sx={{ flex: '1 1 100%' }}></Box>
diff --git a/grader_labextension/src/components/coursemanage/grading/table-toolbar.tsx b/grader_labextension/src/components/coursemanage/grading/table-toolbar.tsx
index 38619d45..a1832fa0 100644
--- a/grader_labextension/src/components/coursemanage/grading/table-toolbar.tsx
+++ b/grader_labextension/src/components/coursemanage/grading/table-toolbar.tsx
@@ -8,7 +8,8 @@ import {
   InputAdornment,
   Stack,
   ToggleButton,
-  ToggleButtonGroup
+  ToggleButtonGroup,
+  Tooltip
 } from '@mui/material';
 import FileDownloadIcon from '@mui/icons-material/FileDownload';
 import ReplayIcon from '@mui/icons-material/Replay';
@@ -192,7 +193,15 @@ export function EnhancedTableToolbar(props: EnhancedTableToolbarProps) {
     });
   };
 
-
+  const checkAutogradeStatus = () => {
+    let available = true;
+      selected.forEach(async id =>{
+        const row = rows.find(value => value.id === id);
+        if(row.auto_status !== 'automatically_graded')
+          available = false;
+      })
+      return available;
+  };
 
 
   return (
@@ -266,13 +275,19 @@ export function EnhancedTableToolbar(props: EnhancedTableToolbarProps) {
         )}
         {numSelected > 0 ? (
           <ButtonGroup size='small' aria-label='autograde feedback buttons'>
-            <Button key={'autograde'} sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
-                    onClick={handleAutogradeSubmissions}>
-              Autograde
-            </Button>
+            <Tooltip title={'To generate feedback all selected submissions must be autograded.'}>
+              <Button key={'autograde'} sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}
+                      onClick={handleAutogradeSubmissions}>
+                Autograde
+              </Button>
+            </Tooltip>
+            
+            {checkAutogradeStatus() === true ?
             <Button key={'feedback'} sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }} onClick={handleGenerateFeedback}>
               {'Generate Feedback'}
-            </Button>
+             </Button>
+            : null}
+            
           </ButtonGroup>
         ) : (
           <Stack direction='row' spacing={2}>
diff --git a/grader_labextension/src/components/coursemanage/settings/settings.tsx b/grader_labextension/src/components/coursemanage/settings/settings.tsx
index 3361cfa3..99757dfe 100644
--- a/grader_labextension/src/components/coursemanage/settings/settings.tsx
+++ b/grader_labextension/src/components/coursemanage/settings/settings.tsx
@@ -1,7 +1,7 @@
 import { Assignment } from '../../../model/assignment';
 import { Submission } from '../../../model/submission';
 import * as React from 'react';
-import { ErrorMessage, useFormik } from 'formik';
+import { useFormik } from 'formik';
 import {
   Box,
   Button,
@@ -11,15 +11,15 @@ import {
   MenuItem,
   Stack,
   TextField,
-  Tooltip, Typography
+  Tooltip, Typography, 
 } from '@mui/material';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
 import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
 import HelpOutlineOutlinedIcon from '@mui/icons-material/HelpOutlineOutlined';
 import {
-  deleteAssignment,
-  updateAssignment
+  updateAssignment,
+  deleteAssignment
 } from '../../../services/assignments.service';
 import { enqueueSnackbar } from 'notistack';
 import { Lecture } from '../../../model/lecture';
@@ -28,7 +28,6 @@ import { SectionTitle } from '../../util/section-title';
 import { useNavigate, useRouteLoaderData } from 'react-router-dom';
 import { getLateSubmissionInfo, ILateSubmissionInfo, LateSubmissionForm } from './late-submission-form';
 import { FormikValues } from 'formik/dist/types';
-import { SubmissionPeriod } from '../../../model/submissionPeriod';
 import moment from 'moment';
 import { red } from '@mui/material/colors';
 import { showDialog } from '../../util/dialog-provider';
@@ -48,7 +47,6 @@ const validationSchema = yup.object({
     .required('Name is required'),
   due_date: yup
     .date()
-    .min(new Date(), 'Deadline must be set in the future')
     .nullable(),
   type: yup.mixed().oneOf(['user', 'group']),
   automatic_grading: yup.mixed().oneOf(['unassisted', 'auto', 'full_auto']),
@@ -217,13 +215,18 @@ export const SettingsComponent = () => {
             />
             <DateTimePicker
               ampm={false}
-              disabled={!checked}
               label='DateTimePicker'
-              disablePast
+              disabled={!checked}
               value={formik.values.due_date}
               onChange={(date: Date) => {
                 formik.setFieldValue('due_date', date);
+                if(new Date(date).getTime() < Date.now()){
+                  enqueueSnackbar("You selected date in past!",{
+                    variant: 'warning'
+                  });
+                }
               }}
+              
             />
           </LocalizationProvider>
 
@@ -324,25 +327,6 @@ export const SettingsComponent = () => {
                   first!</Typography>}
             </Stack>
           </Stack>
-
-          {/* Not included in release 0.1
-              <InputLabel id="demo-simple-select-label">Type</InputLabel>
-              <Select
-                labelId="assignment-type-select-label"
-                id="assignment-type-select"
-                value={formik.values.type}
-                label="Type"
-                disabled={
-                  assignment.status === 'complete' ||
-                  assignment.status === 'released'
-                }
-                onChange={e => {
-                  formik.setFieldValue('type', e.target.value);
-                }}
-              >
-                <MenuItem value={'user'}>User</MenuItem>
-                <MenuItem value={'group'}>Group</MenuItem>
-              </Select>*/}
         </Stack>
         <Stack direction={'row'} spacing={2} sx={{ mt: 2 }}>
           <Button sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }} color='primary' variant='contained' type='submit'>
diff --git a/grader_labextension/src/components/util/deadline.tsx b/grader_labextension/src/components/util/deadline.tsx
index dbc0d767..5fbf448b 100644
--- a/grader_labextension/src/components/util/deadline.tsx
+++ b/grader_labextension/src/components/util/deadline.tsx
@@ -303,11 +303,13 @@ export function DeadlineDetail(props: IDeadlineDetailProps) {
           >
             {props.late_submissions.map(l => {
               const p = moment.duration(l.period);
+              const outputDays = p.days() > 1 ? `Days` : `Day`;
+              const outputHours = p.hours() == 1 ? `Hour` : `Hours`;
               return <ListItem sx={{ pl: 4 }}>
                 <ListItemIcon>
                   <AlarmAddIcon />
                 </ListItemIcon>
-                <ListItemText primary={`${p.days()} Days ${p.hours()} Hours`} />
+                <ListItemText primary={`${p.days()} ${outputDays} ${p.hours()} ${outputHours}`} />
                 <ListItemText primary={`Penalty: ${((1 - l.scaling) * 100).toFixed(1)}%`} />
               </ListItem>;
             })}
diff --git a/grader_labextension/src/components/util/dialog.tsx b/grader_labextension/src/components/util/dialog.tsx
index af49d7fb..3a4bd9eb 100644
--- a/grader_labextension/src/components/util/dialog.tsx
+++ b/grader_labextension/src/components/util/dialog.tsx
@@ -29,7 +29,11 @@ import {
   Card,
   CardActionArea,
   Box,
-  InputAdornment
+  InputAdornment,
+  TooltipProps,
+  tooltipClasses,
+  Typography,
+  Snackbar
 } from '@mui/material';
 import { Assignment } from '../../model/assignment';
 import { LoadingButton } from '@mui/lab';
@@ -47,7 +51,8 @@ import { Simulate } from 'react-dom/test-utils';
 import error = Simulate.error;
 import { enqueueSnackbar } from 'notistack';
 import { showDialog } from './dialog-provider';
-
+import styled from '@mui/system/styled';
+import MuiAlert, { AlertProps } from '@mui/material/Alert';
 
 
 const gradingBehaviourHelp = `Specifies the behaviour when a students submits an assignment.\n
@@ -88,6 +93,14 @@ export interface IEditLectureProps {
   handleSubmit: (updatedLecture: Lecture) => void;
 }
 
+  const EditLectureNameTooltip = styled(({ className, ...props }: TooltipProps) => (
+    <Tooltip {...props} classes={{ popper: className }} />
+  ))(({ theme }) => ({
+    [`& .${tooltipClasses.tooltip}`]: {
+      maxWidth: 220
+    },
+  }));
+
 export const EditLectureDialog = (props: IEditLectureProps) => {
   const formik = useFormik({
     initialValues: {
@@ -106,7 +119,16 @@ export const EditLectureDialog = (props: IEditLectureProps) => {
 
   return (
     <div>
-      <Tooltip title={'Edit Lecture'}>
+        <EditLectureNameTooltip
+        title={
+          props.lecture.code === props.lecture.name ?(
+            <React.Fragment>
+            <Typography color="inherit">Edit Lecture</Typography>
+            {"Note: "} <em>{"Lecture name is currently the same as lecture code. You should edit it to make it more readable."}</em>
+          </React.Fragment>
+          ): "Edit Lecture"
+        }
+      >
         <IconButton
           onClick={e => {
             e.stopPropagation();
@@ -117,7 +139,7 @@ export const EditLectureDialog = (props: IEditLectureProps) => {
         >
           <SettingsIcon />
         </IconButton>
-      </Tooltip>
+      </EditLectureNameTooltip>
       <Dialog open={openDialog} onBackdropClick={() => setOpen(false)}>
         <DialogTitle>Edit Lecture</DialogTitle>
         <form onSubmit={formik.handleSubmit}>
@@ -242,6 +264,23 @@ export const CreateDialog = (props: ICreateDialogProps) => {
 
   const [openDialog, setOpen] = React.useState(false);
 
+  const [openSnackbar, setOpenSnackBar] = React.useState(false);
+
+  const handleOpenSnackBar = () => {
+    setOpenSnackBar(true);
+  };
+
+  const handleCloseSnackBar = () => {
+    setOpenSnackBar(false);
+  };
+
+  const Alert = React.forwardRef<HTMLDivElement, AlertProps>(function Alert(
+    props,
+    ref,
+  ) {
+    return <MuiAlert elevation={6} ref={ref} variant="filled" {...props} />;
+  });
+  
   return (
     <>
       <Tooltip title={'Create New Assignment'}>
@@ -295,15 +334,22 @@ export const CreateDialog = (props: ICreateDialogProps) => {
                 />
 
                 <DateTimePicker
-                  disablePast
                   ampm={false}
                   disabled={formik.values.due_date === null}
                   label='DateTimePicker'
                   value={formik.values.due_date}
                   onChange={(date: Date) => {
                     formik.setFieldValue('due_date', date);
+                    if(new Date(date).getTime() < Date.now()){
+                      handleOpenSnackBar();
+                    }
                   }}
                 />
+                <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={handleCloseSnackBar} >
+                <Alert onClose={handleCloseSnackBar} severity="warning" sx={{ width: '100%' }}>
+                  You chose date in the past!
+                </Alert>
+              </Snackbar>
               </LocalizationProvider>
 
               <FormControlLabel
diff --git a/grader_labextension/src/components/util/file-item.tsx b/grader_labextension/src/components/util/file-item.tsx
new file mode 100644
index 00000000..9939e529
--- /dev/null
+++ b/grader_labextension/src/components/util/file-item.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import {
+  ListItem,
+  ListItemButton,
+  ListItemIcon,
+  ListItemText,
+  Tooltip,
+  Stack,
+  Typography,
+} from '@mui/material';
+import InsertDriveFileRoundedIcon from '@mui/icons-material/InsertDriveFileRounded';
+import WarningIcon from '@mui/icons-material/Warning';
+import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
+import { Contents } from '@jupyterlab/services';
+import DangerousIcon from '@mui/icons-material/Dangerous';
+import {File, getRelativePathAssignment} from '../../services/file.service';
+
+interface IFileItemProps {
+  file: File;
+  inContained: (file: string) => boolean;
+  missingFiles?: File[],
+  extraFileHelp: string;
+  missingFileHelp: string;
+  openFile: (path: string) => void;
+  allowFiles?: boolean;
+}
+
+const FileItem = ({
+  file,
+  inContained,
+  extraFileHelp,
+  missingFileHelp,
+  openFile,
+  allowFiles,
+  missingFiles,
+}: IFileItemProps) => {
+
+  const inMissing = (filePath: string) => {
+    return missingFiles.some((missingFile) => missingFile.path === filePath);
+  };
+
+  //console.log("Missing files (file-item): " + missingFiles.map(f => f.path));
+  return (
+    <ListItem disablePadding>
+      <ListItemButton onClick={() => openFile(file.path)} dense={true}>
+        <ListItemIcon>
+          <KeyboardArrowRightIcon sx={{visibility:'hidden'}}/>
+          <InsertDriveFileRoundedIcon />
+        </ListItemIcon>
+        <ListItemText 
+          primary={<Typography>{file.name}</Typography>}
+          secondary=
+          {
+            <Stack direction={'row'} spacing={2}>
+              {inMissing(file.path) && (
+                <Tooltip title={missingFileHelp}>
+                  <Stack direction={'row'} spacing={2} flex={0}>
+                    <DangerousIcon color={'error'} fontSize={'small'} />
+                    <Typography sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}>
+                      Missing File
+                    </Typography>
+                  </Stack>
+                </Tooltip>
+              )}
+              {
+            <Stack direction={'row'} spacing={2}>
+              {!inContained(getRelativePathAssignment(file.path)) && !allowFiles && (
+                <Tooltip title={extraFileHelp}>
+                  <Stack direction={'row'} spacing={2} flex={0}>
+                    <WarningIcon color={'warning'} fontSize={'small'} />
+                    <Typography sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}>
+                      Extra File
+                    </Typography>
+                  </Stack>
+                </Tooltip>
+              )}
+            </Stack>
+          }
+            </Stack>
+          }
+        />
+      </ListItemButton>
+    </ListItem>
+  );
+};
+
+export default FileItem;
\ No newline at end of file
diff --git a/grader_labextension/src/components/util/file-list.tsx b/grader_labextension/src/components/util/file-list.tsx
index 31672220..c76ff990 100644
--- a/grader_labextension/src/components/util/file-list.tsx
+++ b/grader_labextension/src/components/util/file-list.tsx
@@ -1,50 +1,47 @@
-// Copyright (c) 2022, TU Wien
-// All rights reserved.
-//
-// This source code is licensed under the BSD-style license found in the
-// LICENSE file in the root directory of this source tree.
-
-import * as React from 'react';
+import React from 'react';
 import {
   Box,
   Card,
   List,
   ListItem,
-  ListItemButton,
   ListItemIcon,
   ListItemText,
-  Paper, Stack, Tooltip,
-  Typography
+  Paper,
+  Tooltip,
+  Typography,
 } from '@mui/material';
-import InsertDriveFileRoundedIcon from '@mui/icons-material/InsertDriveFileRounded';
-import { GlobalObjects } from '../../index';
 import { Contents } from '@jupyterlab/services';
 import IModel = Contents.IModel;
-import { SxProps } from '@mui/system';
+import { Stack, SxProps } from '@mui/system';
 import { Theme } from '@mui/material/styles';
-import { getFiles, openFile } from '../../services/file.service';
-import { enqueueSnackbar } from 'notistack';
+import { getFiles, openFile, File, extractRelativePathsAssignment, getRelativePathAssignment, lectureBasePath} from '../../services/file.service';
 import { grey } from '@mui/material/colors';
-import WarningIcon from '@mui/icons-material/Warning';
-import DangerousIcon from '@mui/icons-material/Dangerous';
+import FileItem from './file-item';
+import FolderItem from './folder-item';
 import { Assignment } from '../../model/assignment';
+import { Lecture } from '../../model/lecture';
+
 
 interface IFileListProps {
   path: string;
   sx?: SxProps<Theme>;
   shouldContain?: string[];
   assignment?: Assignment;
+  lecture?: Lecture;
+  missingFiles?: File[];
 }
 
+
+
 export const FilesList = (props: IFileListProps) => {
   const [files, setFiles] = React.useState([]);
 
+
   React.useEffect(() => {
-    getFiles(props.path).then(files => {
-      setFiles(files);
-    });
+    getFiles(props.path).then((files) => setFiles(files));
   }, [props]);
 
+
   const inContained = (file: string) => {
     if (props.shouldContain) {
       return props.shouldContain.filter(f => file === f).length > 0;
@@ -52,79 +49,78 @@ export const FilesList = (props: IFileListProps) => {
     return true;
   };
 
-  const extraFileHelp = `This file is not part of the assignment and will be removed when grading! Did you rename a notebook file or added it manually?`;
+  
+  const extraFileHelp = `This file is not part of the assignment and will be removed when grading! Did you rename a notebook file or add it manually?`;
   const missingFileHelp = `This file should be part of your assignment! Did you delete it?`;
 
-  // generateItems will be fed using the IIterator from the FilterFileBrowserModel
-  const generateItems = (files: { value: IModel, done: boolean }[]) => {
-    return files.map(file => (
-      <ListItem disablePadding>
-        <ListItemButton onClick={() => openFile(file.value.path)} dense={true}>
-          <ListItemIcon>
-            <InsertDriveFileRoundedIcon />
-          </ListItemIcon>
-          <ListItemText primary={<Typography>{file.value.name}</Typography>}
-                        /*
-                        secondary={
-                          (!inContained(file.value.name))
-                            ? <Stack direction={'row'} spacing={2}>
-                              <Tooltip title={extraFileHelp}>
-                                <Stack direction={'row'} spacing={2} flex={0}>
-                                  <WarningIcon color={'warning'} fontSize={'small'} />
-                                  <Typography sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}>Extra File</Typography>
-                                </Stack>
-                              </Tooltip>
-                            </Stack>
-                            : null
-                        }
-                         */
-          />
-        </ListItemButton>
-      </ListItem>
-    ));
-  };
+  const generateItems = (files: File[]) => {
+   
+    const filePaths = files.flatMap((file) => extractRelativePathsAssignment(file));
+    const missingFiles : File[] =
+    (props.shouldContain &&
+    props.shouldContain
+      .filter((f) => !filePaths.includes(f))
+      .map((missingFile) => ({
+        name: missingFile.substring(missingFile.lastIndexOf("/") + 1) || missingFile, 
+        path: `${lectureBasePath}${props.lecture.code}/assignments/${props.assignment.id}/` + missingFile, 
+        type: 'file', 
+        content: [], 
+      }))) || [];
 
-  // creates items for files that should be included in the file list if shouldContain is specified
-  const generateMissingItems = (files: { value: IModel, done: boolean }[]) => {
-    if (props.shouldContain) {
-      const fileNames = files.map(file => file.value.name);
-      const missingFiles = props.shouldContain.filter(f => !fileNames.includes(f));
-      return missingFiles.map(file => (
-        <ListItem disablePadding>
-          <ListItem>
-            <ListItemIcon>
-              <InsertDriveFileRoundedIcon color={'disabled'} />
-            </ListItemIcon>
-            <ListItemText primary={<Typography color={'text.secondary'}>{file}</Typography>}
-                          secondary={
-                            <Stack direction={'row'} spacing={2}>
-                              <Tooltip title={missingFileHelp}>
-                                <Stack direction={'row'} spacing={2} flex={0}>
-                                  <DangerousIcon color={'error'} fontSize={'small'} />
-                                  <Typography sx={{ whiteSpace: 'nowrap', minWidth: 'auto' }}>File Missing</Typography>
-                                </Stack>
-                              </Tooltip>
-                            </Stack>
-                          } />
-          </ListItem>
-        </ListItem>
-      ));
-    } else {
-      return [];
-    }
-  };
+      const missingFilesTopOrder = missingFiles.filter((missingFile) => {
+        const relativePath = getRelativePathAssignment(missingFile.path);
+        return !relativePath.includes('/');
+      });
 
+    
+    const items = files.concat(missingFilesTopOrder).map((file: File) => {
+      if (file.type === 'directory') {
+        
+        return (
+          <FolderItem
+            key={file.path}
+            folder={file}
+            missingFiles={missingFiles || []}
+            missingFileHelp={missingFileHelp}
+            inContained={inContained}
+            extraFileHelp={extraFileHelp}
+            openFile={openFile}
+            allowFiles={props.assignment?.allow_files}
+          />
+        );
+      } else {
+        return (
+          <FileItem
+            key={file.path}
+            file={file}
+            missingFiles={missingFiles || []}
+            missingFileHelp={missingFileHelp}
+            inContained={inContained}
+            extraFileHelp={extraFileHelp}
+            openFile={openFile}
+            allowFiles={props.assignment?.allow_files}
+          />
+        );
+      }
+    });
+  
+    return items;
+  };
+  
   return (
     <Paper elevation={0} sx={props.sx}>
-      <Card sx={{ mt: 1, maxHeight: 300, overflow: 'auto' }} variant='outlined'>
+      <Card sx={{ mt: 1, mb: 1, overflow: 'auto' }} variant="outlined">
         {files.length === 0 ? (
           <Typography variant={'body1'} color={grey[500]} sx={{ ml: 1 }}>
             No Files Found
           </Typography>
         ) : (
-          <List dense={false}>{[...generateItems(files), ...generateMissingItems(files)]}</List>
+          <List dense={false}>{generateItems(files)}</List>
         )}
       </Card>
     </Paper>
   );
+  
 };
+
+
diff --git a/grader_labextension/src/components/util/folder-item.tsx b/grader_labextension/src/components/util/folder-item.tsx
new file mode 100644
index 00000000..2040c7b5
--- /dev/null
+++ b/grader_labextension/src/components/util/folder-item.tsx
@@ -0,0 +1,123 @@
+import React, { useState } from 'react';
+import {
+  ListItem,
+  ListItemButton,
+  ListItemIcon,
+  ListItemText,
+  Collapse,
+  Stack,
+  Tooltip,
+  Typography,
+  List,
+} from '@mui/material';
+import { Contents } from '@jupyterlab/services';
+import IModel = Contents.IModel; 
+import FolderIcon from '@mui/icons-material/Folder';
+import FileItem from './file-item';
+import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
+import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
+import { File, getFiles } from '../../services/file.service';
+
+interface IFolderItemProps {
+  folder: File;
+  inContained: (file: string) => boolean;
+  openFile: (path: string) => void;
+  allowFiles?: boolean;
+  extraFileHelp: string;
+  missingFiles?: File[];
+  missingFileHelp: string;
+}
+
+
+const FolderItem = ({
+  folder,
+  missingFiles,
+  extraFileHelp,
+  missingFileHelp,
+  inContained,
+  openFile,
+  allowFiles
+}) => {
+  const [open, setOpen] = useState(false);
+
+  const [nestedFiles, setNestedFiles] = useState([]);
+
+  const missingFilesByDirectory = missingFiles.reduce((acc, missingFile) => {
+    const directoryPath = missingFile.path.substring(0, missingFile.path.lastIndexOf("/"));
+    if (!acc[directoryPath]) {
+      acc[directoryPath] = [];
+    }
+    acc[directoryPath].push(missingFile);
+    return acc;
+  }, {});
+
+  const handleToggle = async () => {
+    if (!open) {
+      try {
+        const nestedFiles = await getFiles(folder.path);
+        const missingFilesForDirectory = missingFilesByDirectory[folder.path] || [];
+        // Update nested files with missing files if there are any that should be in this folder
+        const folderContents = nestedFiles.concat(missingFilesForDirectory); 
+        setNestedFiles(folderContents);
+      } catch (error) {
+        console.error('Error fetching nested files:', error);
+      }
+    }
+    setOpen(!open);
+  };
+
+  //console.log("Folder " + folder.name + " contents: " + folder.content.map(f => f.path));
+
+  return (
+    <>
+      <ListItem disablePadding>
+        <ListItemButton onClick={handleToggle} dense={true}>
+          <ListItemIcon>
+          {open ? (
+              <KeyboardArrowUpIcon />
+            ) : (
+              <KeyboardArrowRightIcon />
+            )}
+            <FolderIcon />
+          </ListItemIcon>
+          <ListItemText
+            primary={<Typography>{folder.name}</Typography>}
+          />
+        </ListItemButton>
+      </ListItem>
+      <Collapse in={open} timeout="auto" unmountOnExit>
+        <List sx={{ml: 3}}>
+        {nestedFiles.length > 0 &&
+          nestedFiles.map((file) =>
+            file.type === 'directory' ? (
+              <FolderItem
+                key={file.path}
+                folder={file}
+                missingFiles={missingFiles || []}
+                missingFileHelp={missingFileHelp}
+                inContained={inContained}
+                openFile={openFile}
+                allowFiles={allowFiles}
+                extraFileHelp={extraFileHelp}
+              />
+            ) : (
+              <FileItem
+                key={file.path}
+                file={file}
+                missingFiles={missingFiles || []}
+                missingFileHelp={missingFileHelp}
+                inContained={inContained}
+                extraFileHelp={extraFileHelp}
+                openFile={openFile}
+                allowFiles={allowFiles}   
+              />
+            )
+          )}
+        </List>
+     
+      </Collapse>
+    </>
+  );
+};
+
+export default FolderItem;
diff --git a/grader_labextension/src/services/file.service.ts b/grader_labextension/src/services/file.service.ts
index 023bb8b9..042c3d22 100644
--- a/grader_labextension/src/services/file.service.ts
+++ b/grader_labextension/src/services/file.service.ts
@@ -29,14 +29,24 @@ if (lectureBasePath !== '') {
 // the number of sub paths in lecture base path e.g. grader/Lectures -> 2
 export const lectureSubPaths: number = lectureBasePath.split('/').reduce((acc, v) => (v.length > 0) ? acc + 1 : acc, 0);
 
-export const getFiles = async (path: string): Promise<IModel[]> => {
+export interface File {
+  name: string;
+  path: string;
+  type: string;
+  content: File[];
+}
+
+// TODO: getFiles should return Promise<File[]>
+export const getFiles = async (path: string): Promise<File[]> => {
   if (path === null) {
     return [];
   }
+
   const model = new FilterFileBrowserModel({
     auto: true,
-    manager: GlobalObjects.docManager
+    manager: GlobalObjects.docManager,
   });
+
   try {
     await model.cd(path);
   } catch (_) {
@@ -46,17 +56,50 @@ export const getFiles = async (path: string): Promise<IModel[]> => {
   if (model.path !== path) {
     return [];
   }
+
   const items = model.items();
-  const files = [];
+  const files: File[] = []; // Type files as File[]
+
   let f = items.next();
   while (f.value !== undefined) {
-    files.push(f);
+    if (f.value.type === 'directory') {
+      const nestedFiles = await getFiles(f.value.path);
+      files.push({
+        name: f.value.name,
+        path: f.value.path,
+        type: f.value.type,
+        content: nestedFiles,
+      });
+    } else {
+      files.push({
+        name: f.value.name,
+        path: f.value.path,
+        type: f.value.type,
+        content: [],
+      });
+    }
     f = items.next();
   }
+
   console.log('getting files from path ' + path);
   return files;
 };
 
+export const getRelativePathAssignment = (path: string) => {
+  const regex = /assignments\/[^/]+\/(.+)/;
+  const match = path.match(regex);
+  return match ? match[1] : path;
+};
+
+export const extractRelativePathsAssignment = (file: File) => {
+  if (file.type === 'directory') {
+    const nestedPaths = file.content.flatMap((nestedFile) => extractRelativePathsAssignment(nestedFile));
+    return [getRelativePathAssignment(file.path), ...nestedPaths];
+  } else {
+    return [getRelativePathAssignment(file.path)];
+  }
+};
+
 export const openFile = async (path: string) => {
   GlobalObjects.commands
     .execute('docmanager:open', {
@@ -74,11 +117,31 @@ export const openFile = async (path: string) => {
 
 export const makeDir = async (path: string, name: string) => {
   const newPath = PathExt.join(path, name);
-  const exists = (await getFiles(path)).map(f => (f as any).value.name).includes(name);
+  let exists = false;
+  const model = new FilterFileBrowserModel({
+    auto: true,
+    manager: GlobalObjects.docManager
+  });
+  try {
+    await model.cd(path);
+  } catch (_) {
+    exists = false;
+  }
+  const items = model.items();
+  let f = items.next();
+  while (f.value !== undefined) {
+    if (f.value.type === 'directory') {
+      if (f.value.name === name) {
+        exists = true;
+      }
+    }
+    f = items.next();
+  }
+
+  console.log('direcory: ' + name + ' exists: ' + exists);
   if (!exists) {
     const model = await GlobalObjects.docManager.newUntitled({ path, type: 'directory' });
     const oldPath = PathExt.join(path, model.name);
-    console.log(oldPath, newPath)
     await GlobalObjects.docManager.rename(oldPath, newPath).catch(error => {
       if (error.response.status !== 409) {
         // if it's not caused by an already existing file, rethrow
@@ -86,17 +149,21 @@ export const makeDir = async (path: string, name: string) => {
       }
     });
   }
+  console.log('new path created: ' + newPath);
   return newPath;
-}
+};
 
-export const makeDirs = async(path: string, names: string[]) =>{
+export const makeDirs = async (path: string, names: string[]) => {
   let p = path;
+  console.log('path: ' + path);
   for (let i = 0; i < names.length; i++) {
     const n = names[i];
-    p = await makeDir(p, n);    
+    console.log('try to create dir: ' + names[i]);
+    p = await makeDir(p, n);
+
   }
   return p;
-}
+};
 
 export interface IGitLogObject {
   commit: string,
diff --git a/grader_labextension/src/services/request.service.ts b/grader_labextension/src/services/request.service.ts
index adec671f..fb3e81db 100644
--- a/grader_labextension/src/services/request.service.ts
+++ b/grader_labextension/src/services/request.service.ts
@@ -49,7 +49,7 @@ export function request<T, B = any>(
     async response => {
       if (!response.ok) {
         return response.text().then(text => {
-          throw new Error(JSON.parse(text)['message']);
+          throw new Error(JSON.parse(text)['reason']);
         });
       }
       let data: any = await response.text();
diff --git a/grader_service/grader_service/autograding/local_grader.py b/grader_service/grader_service/autograding/local_grader.py
index dedab334..063e84b7 100644
--- a/grader_service/grader_service/autograding/local_grader.py
+++ b/grader_service/grader_service/autograding/local_grader.py
@@ -405,11 +405,10 @@ def _set_db_state(self, success=True):
         else:
             self.submission.auto_status = "grading_failed"
 
+        self.grading_logs = self.grading_logs.replace("\x00", "")
         logs = SubmissionLogs(logs=self.grading_logs,
                               sub_id=self.submission.id)
-
         self.session.merge(logs)
-
         self.session.commit()
 
     def _cleanup(self):
diff --git a/grader_service/grader_service/handlers/assignment.py b/grader_service/grader_service/handlers/assignment.py
index bd7ec4e6..bb5e46de 100644
--- a/grader_service/grader_service/handlers/assignment.py
+++ b/grader_service/grader_service/handlers/assignment.py
@@ -364,7 +364,7 @@ class AssignmentPropertiesHandler(GraderBaseHandler):
 
     route: /lectures/{lecture_id}/assignments/{assignment_id}/properties."""
 
-    @authorize([Scope.tutor, Scope.instructor])
+    @authorize([Scope.student, Scope.tutor, Scope.instructor])
     async def get(self, lecture_id: int, assignment_id: int):
         """
         Returns the properties of a specific assignment.
@@ -380,7 +380,14 @@ async def get(self, lecture_id: int, assignment_id: int):
         self.validate_parameters()
         assignment = self.get_assignment(lecture_id, assignment_id)
         if assignment.properties is not None:
-            self.write(assignment.properties)
+            if self.get_role(lecture_id).role == Scope.student:
+                model = GradeBookModel.from_dict(
+                    json.loads(assignment.properties))
+                for notebook in model.notebooks.values():
+                    notebook.source_cells_dict = {}
+                self.write(json.dumps(model.to_dict()))
+            else:
+                self.write(assignment.properties)
         else:
             raise HTTPError(HTTPStatus.NOT_FOUND,
                             reason="Assignment not found")
diff --git a/grader_service/grader_service/handlers/base_handler.py b/grader_service/grader_service/handlers/base_handler.py
index 063c1a49..d6e31808 100644
--- a/grader_service/grader_service/handlers/base_handler.py
+++ b/grader_service/grader_service/handlers/base_handler.py
@@ -12,18 +12,16 @@
 import os
 import shutil
 import sys
-import traceback
 from _decimal import Decimal
 from http import HTTPStatus
 from pathlib import Path
 from typing import Any, Awaitable, Callable, List, Optional
 
-from traitlets import Type, Integer, TraitType, Unicode, Union, Bool
+from traitlets import Type, Integer, TraitType, Unicode
 from traitlets import List as ListTrait
 from traitlets.config import SingletonConfigurable
 
 from grader_service.api.models.base_model_ import Model
-from grader_service.api.models.error_message import ErrorMessage
 from grader_service.autograding.local_grader import LocalAutogradeExecutor
 from grader_service.orm import Group, Assignment, Submission
 from grader_service.orm.base import Serializable, DeleteState
@@ -321,28 +319,6 @@ def write_json(self, obj) -> None:
         chunk = GraderBaseHandler._serialize(obj)
         self.write(json.dumps(chunk))
 
-    def write_error(self, status_code: int, **kwargs) -> None:
-
-        self.set_header('Content-Type', 'application/json')
-        self.set_status(status_code)
-        _, e, _ = kwargs.get("exc_info", (None, None, None))
-        error = httputil.responses.get(status_code, "Unknown")
-        reason = kwargs.get("reason", None)
-        if e and isinstance(e, HTTPError) and e.reason:
-            reason = e.reason
-        if self.settings.get("serve_traceback") and "exc_info" in kwargs:
-            # in debug mode, try to send a traceback
-            lines = []
-            for line in traceback.format_exception(*kwargs["exc_info"]):
-                lines.append(line)
-            self.finish(json.dumps(
-                ErrorMessage(status_code, error, self.request.path, reason,
-                             traceback=json.dumps(lines)).to_dict()))
-        else:
-            self.finish(json.dumps(ErrorMessage(status_code, error,
-                                                self.request.path,
-                                                reason).to_dict()))
-
     @classmethod
     def _serialize(cls, obj: object):
         if isinstance(obj, list):
@@ -394,9 +370,6 @@ async def get(self):
         self.write("1.0")
 
 
-
-
-
 @register_handler(r"\/", VersionSpecifier.V1)
 class VersionHandlerV1(GraderBaseHandler):
     async def get(self):