diff --git a/frontend/src/components/project/ProjectInfo.vue b/frontend/src/components/project/ProjectInfo.vue
index 3cc00f9e..e6c1be42 100644
--- a/frontend/src/components/project/ProjectInfo.vue
+++ b/frontend/src/components/project/ProjectInfo.vue
@@ -28,11 +28,6 @@
                 </v-card-title>
                 <div v-html="renderQuillContent(project.description)"></div>
             </v-card-item>
-            <v-card-actions>
-                <v-btn v-if="isTeacher" :to="`/project/${project.id}/submissions`">
-                    {{ $t("project.submissions_list_teacher") }}
-                </v-btn>
-            </v-card-actions>
         </v-card>
         <SubmitInfo class="submitInfo" v-if="group" :project="project" :group="group" />
     </v-container>
diff --git a/frontend/src/components/submission/SubmissionCard.vue b/frontend/src/components/submission/SubmissionCard.vue
index 0992e811..3d842221 100644
--- a/frontend/src/components/submission/SubmissionCard.vue
+++ b/frontend/src/components/submission/SubmissionCard.vue
@@ -1,86 +1,75 @@
 <template>
     <v-divider />
     <v-card variant="flat">
-        <v-row>
-            <v-col>
-                <v-card-title>
-                    {{ $t("submission.status") }}
-                    <p
-                        v-if="new Date(submission.date) <= deadline"
-                        :class="Status[submission.status]"
-                    >
-                        {{ Status[submission.status] }}
-                    </p>
-                    <p v-else class="Deadline">{{ $t("submission.after_deadline") }}</p>
-                </v-card-title>
-                <v-card-subtitle>
-                    {{ $t("submission.datetime") }} {{ $d(submission.date, "long") }}
-                </v-card-subtitle>
-                <v-card-item>
-                    <v-card-title>
-                        {{ $t("submission.remarks") }}
-                    </v-card-title>
-                    <v-card-text v-if="submission.remarks">
-                        {{ submission.remarks }}
-                    </v-card-text>
-                    <v-card-subtitle v-else>
-                        {{ $t("submission.remarks_empty") }}
-                    </v-card-subtitle>
-                </v-card-item>
-                <v-card-item
-                    v-if="submission.stderr || submission.stdout || submission.testresults.length"
-                >
-                    <v-card-title>{{ $t("submission.docker_test") }}</v-card-title>
-                    <v-card-text>
-                        <p v-if="submission.stdout">Stdout: {{ submission.stdout }}</p>
-                        <p v-if="submission.stderr">Sterr: {{ submission.stderr }}</p>
-                        <ul>
-                            <li v-for="result in submission.testresults" :key="result">
-                                <p v-if="result.succeeded" class="text-green">{{ result.value }}</p>
-                                <p v-else class="text-red">{{ result.value }}</p>
-                            </li>
-                        </ul>
-                    </v-card-text>
-                </v-card-item>
-            </v-col>
-            <v-col>
-                <v-card-item>
-                    <v-card-title>
-                        {{ $t("submission.files") }}
-                    </v-card-title>
-                    <v-card-subtitle>
-                        {{ $t("submission.download_info") }}
-                    </v-card-subtitle>
-                    <v-container>
-                        <v-alert
-                            v-if="isError"
-                            title="Error"
-                            color="error"
-                            :text="error!.message"
-                        ></v-alert>
-                        <v-skeleton-loader v-else :loading="isLoading" type="card">
-                            <v-col>
-                                <v-chip
-                                    class="ma-2"
-                                    v-for="(item, index) in files"
-                                    label
-                                    color="blue"
-                                    :key="item.filesortedname"
-                                    @click="() => downloadFile(index)"
-                                >
-                                    {{ item.filename }}
-                                </v-chip>
-                            </v-col>
-                        </v-skeleton-loader>
-                    </v-container>
-                    <v-card-actions>
-                        <v-btn @click="downloadAll">
-                            {{ $t("submission.download_all_files") }}
-                        </v-btn>
-                    </v-card-actions>
-                </v-card-item>
-            </v-col>
-        </v-row>
+        <v-card-title>
+            {{ $t("submission.status") }}
+            <p v-if="new Date(submission.date) <= deadline" :class="Status[submission.status]">
+                {{ Status[submission.status] }}
+            </p>
+            <p v-else class="Deadline">{{ $t("submission.after_deadline") }}</p>
+        </v-card-title>
+        <v-card-subtitle>
+            {{ $t("submission.datetime") }} {{ $d(submission.date, "long") }}
+        </v-card-subtitle>
+        <v-card-item>
+            <v-card-title>
+                {{ $t("submission.remarks") }}
+            </v-card-title>
+            <v-card-text v-if="submission.remarks">
+                {{ submission.remarks }}
+            </v-card-text>
+            <v-card-subtitle v-else>
+                {{ $t("submission.remarks_empty") }}
+            </v-card-subtitle>
+        </v-card-item>
+        <v-card-item v-if="submission.stderr || submission.stdout || submission.testresults.length">
+            <v-card-title>{{ $t("submission.docker_test") }}</v-card-title>
+            <v-card-text>
+                <p v-if="submission.stdout">Stdout: {{ submission.stdout }}</p>
+                <p v-if="submission.stderr">Sterr: {{ submission.stderr }}</p>
+                <ul>
+                    <li v-for="result in submission.testresults" :key="result">
+                        <p v-if="result.succeeded" class="text-green">{{ result.value }}</p>
+                        <p v-else class="text-red">{{ result.value }}</p>
+                    </li>
+                </ul>
+            </v-card-text>
+        </v-card-item>
+        <v-card-item>
+            <v-card-title>
+                {{ $t("submission.files") }}
+            </v-card-title>
+            <v-card-subtitle>
+                {{ $t("submission.download_info") }}
+            </v-card-subtitle>
+            <v-container>
+                <v-alert
+                    v-if="isError"
+                    title="Error"
+                    color="error"
+                    :text="error!.message"
+                ></v-alert>
+                <v-skeleton-loader v-else :loading="isLoading" type="card">
+                    <v-col>
+                        <v-chip
+                            class="ma-2"
+                            v-for="(item, index) in files"
+                            label
+                            color="blue"
+                            :key="item.filesortedname"
+                            @click="() => downloadFile(index)"
+                        >
+                            {{ item.filename }}
+                        </v-chip>
+                    </v-col>
+                </v-skeleton-loader>
+            </v-container>
+            <v-card-actions>
+                <v-btn @click="downloadAll">
+                    {{ $t("submission.download_all_files") }}
+                </v-btn>
+            </v-card-actions>
+        </v-card-item>
     </v-card>
 </template>
 
diff --git a/frontend/src/components/submission/SubmissionTeacherCard.vue b/frontend/src/components/submission/SubmissionTeacherCard.vue
index 81099f69..94f3702b 100644
--- a/frontend/src/components/submission/SubmissionTeacherCard.vue
+++ b/frontend/src/components/submission/SubmissionTeacherCard.vue
@@ -3,11 +3,10 @@
         <v-card-title>
             {{ $t("project.group", { number: submission.group_id }) }}
         </v-card-title>
-
         <SubmissionCard class="ma-3" :submission="submission" :deadline="deadline" />
-
+        <v-divider class="divider" />
         <v-card-actions>
-            <v-btn :to="`/groups/${submission.group_id}`">
+            <v-btn :to="`/groups/${submission.group_id}`" class="button">
                 {{ $t("project.submissions_list") }}
             </v-btn>
         </v-card-actions>
@@ -32,6 +31,16 @@ const { submission } = toRefs(props);
 }
 
 .parent-card {
+    background-color: rgb(var(--v-theme-background));
+    padding: 10px;
+    width: 100%;
+}
+
+.button {
     background-color: rgb(var(--v-theme-secondary));
 }
+
+.divider {
+    margin-bottom: 10px;
+}
 </style>
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
index b28fd7d0..18bbfc40 100644
--- a/frontend/src/i18n/locales/en.ts
+++ b/frontend/src/i18n/locales/en.ts
@@ -60,7 +60,7 @@ export default {
         myProject: "My projects",
         capacity_group: "Capacity: ",
         edit: "Edit project",
-        submissions_list: "All submissions",
+        submissions_list: "All submissions from this group",
         submissions_list_teacher: "All submissions for this project",
         submissions_zip: "Download all submissions",
         not_found: "No projects found.",
diff --git a/frontend/src/i18n/locales/nl.ts b/frontend/src/i18n/locales/nl.ts
index 872bb494..ca1bcd5f 100644
--- a/frontend/src/i18n/locales/nl.ts
+++ b/frontend/src/i18n/locales/nl.ts
@@ -60,7 +60,7 @@ export default {
         myProject: "Mijn projecten",
         capacity_group: "Capaciteit: ",
         edit: "Bewerk project",
-        submissions_list: "Alle indieningen",
+        submissions_list: "Alle indieningen van deze groep",
         submissions_list_teacher: "Alle indieningen voor dit project",
         submissions_zip: "Download alle indieningen",
         not_found: "Geen projecten teruggevonden.",
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 69c2a8d1..44d0d08d 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -106,12 +106,6 @@ const router = createRouter({
             component: () => import("../views/SubjectRegisterView.vue"),
             props: (route) => ({ uuid: String(route.params.uuid) }),
         },
-        {
-            path: "/submissions/:submissionId(\\d+)",
-            name: "submission",
-            component: () => import("../views/SubmissionView.vue"),
-            props: (route) => ({ submissionId: Number(route.params.submissionId) }),
-        },
         {
             path: "/settings",
             name: "settings",
diff --git a/frontend/src/views/ProjectView.vue b/frontend/src/views/ProjectView.vue
index e041c9c5..5d8a9d84 100644
--- a/frontend/src/views/ProjectView.vue
+++ b/frontend/src/views/ProjectView.vue
@@ -14,6 +14,14 @@
                         :subject="subject!"
                         :user="user!"
                     />
+                    <v-btn
+                        v-if="isTeacher"
+                        :to="`/project/${project.id}/submissions`"
+                        class="allsubmissions"
+                        variant="flat"
+                    >
+                        {{ $t("project.submissions_list_teacher") }}
+                    </v-btn>
                 </v-col>
                 <v-col cols="2" class="button-container">
                     <ProjectSideBar
@@ -87,6 +95,13 @@ const isDataError = computed(
         isSubjectError.value ||
         isUserError.value
 );
+
+const isTeacher = computed(
+    () =>
+        user.value.is_teacher ||
+        user.value.is_admin ||
+        instructors.value?.some((element) => element.uid == user.value.uid)
+);
 </script>
 
 <style scoped>
@@ -94,4 +109,10 @@ const isDataError = computed(
     margin-top: 20px;
     min-width: 170px;
 }
+
+.allsubmissions {
+    margin: 15px;
+    background-color: rgb(var(--v-theme-primary));
+    color: rgb(var(--v-theme-navtext));
+}
 </style>
diff --git a/frontend/src/views/SubmissionView.vue b/frontend/src/views/SubmissionView.vue
deleted file mode 100644
index a8baac15..00000000
--- a/frontend/src/views/SubmissionView.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-    <v-container>
-        <v-alert v-if="isError" title="Error" color="error" :text="error.message"></v-alert>
-        <v-skeleton-loader v-else :loading="isLoading" type="card">
-            <SubmissionCard :submission="submission" />
-        </v-skeleton-loader>
-    </v-container>
-</template>
-
-<script setup lang="ts">
-import { useSubmissionQuery } from "@/queries/Submission";
-import { toRefs } from "vue";
-import SubmissionCard from "@/components/submission/SubmissionCard.vue";
-
-const props = defineProps<{
-    submissionId: number;
-}>();
-
-const { submissionId } = toRefs(props);
-
-const { data: submission, error, isLoading, isError } = useSubmissionQuery(submissionId);
-</script>
-
-<style scoped>
-.button-container {
-    margin-top: 20px;
-}
-
-.group-button {
-    margin-bottom: 5px;
-    min-width: auto;
-}
-</style>
diff --git a/frontend/src/views/SubmissionsTeacherView.vue b/frontend/src/views/SubmissionsTeacherView.vue
index 346b4ba9..b527bf57 100644
--- a/frontend/src/views/SubmissionsTeacherView.vue
+++ b/frontend/src/views/SubmissionsTeacherView.vue
@@ -1,30 +1,44 @@
 <template>
     <v-container>
         <v-alert v-if="isError" title="Error" color="error" :text="error.message"></v-alert>
-        <v-skeleton-loader v-else :loading="projectLoading || submissionsLoading" type="card">
-            <v-col class="mx-auto">
-                <h1>{{ $t("submission.submissions_title", { project: project.name }) }}</h1>
-
-                <v-btn class="primary-button" @click="downloadAll" prepend-icon="mdi-download">
-                    {{ $t("project.submissions_zip") }}
-                </v-btn>
-
-                <v-alert v-if="submissions.length == 0" icon="$warning" color="warning">
-                    {{ $t("submission.no_submissions") }}</v-alert
+        <v-row v-else>
+            <v-col class="col-sm-12 col-md-6 col-lg-8">
+                <v-skeleton-loader
+                    :loading="projectLoading || submissionsLoading"
+                    type="card"
+                    class="card"
                 >
-                <v-alert v-else icon="$info" color="info" closable>
-                    {{ $t("submission.teacher_submissions_info") }}</v-alert
-                >
-
-                <SubmissionTeacherCard
-                    class="ma-3"
-                    v-for="submission in submissions"
-                    :key="submission"
-                    :submission="submission"
-                    :deadline="project.deadline"
-                />
+                    <v-card-title class="title">{{
+                        $t("submission.submissions_title", { project: project.name })
+                    }}</v-card-title>
+                    <v-card-subtitle v-if="submissions.length == 0" class="subtitle">{{
+                        $t("submission.no_submissions")
+                    }}</v-card-subtitle>
+                    <div v-else>
+                        <v-card-subtitle class="subtitle">{{
+                            $t("submission.teacher_submissions_info")
+                        }}</v-card-subtitle>
+                        <v-btn
+                            class="primary-button"
+                            @click="downloadAll"
+                            prepend-icon="mdi-download"
+                        >
+                            {{ $t("project.submissions_zip") }}
+                        </v-btn>
+                    </div>
+                    <SubmissionTeacherCard
+                        class="ma-3"
+                        v-for="submission in submissions"
+                        :key="submission"
+                        :submission="submission"
+                        :deadline="project.deadline"
+                    />
+                </v-skeleton-loader>
             </v-col>
-        </v-skeleton-loader>
+            <v-col cols="2" class="backbutton">
+                <BackButton title="project.to_project" :destination="`/project/${projectId}`" />
+            </v-col>
+        </v-row>
     </v-container>
 </template>
 
@@ -33,6 +47,7 @@ import { useProjectQuery } from "@/queries/Project";
 import { useProjectSubmissionsQuery } from "@/queries/Submission";
 import { toRefs } from "vue";
 import SubmissionTeacherCard from "@/components/submission/SubmissionTeacherCard.vue";
+import BackButton from "@/components/buttons/BackButton.vue";
 import { download_file } from "@/utils";
 
 const props = defineProps<{
@@ -61,4 +76,23 @@ const downloadAll = () => {
     background-color: rgb(var(--v-theme-primary));
     color: rgb(var(--v-theme-navtext));
 }
+
+.card {
+    background-color: rgb(var(--v-theme-secondary));
+    margin-top: 25px;
+    padding: 15px;
+}
+
+.title,
+.subtitle {
+    width: 100%;
+}
+
+.backbutton {
+    margin-top: 30px;
+}
+
+.primary-button {
+    margin: 15px;
+}
 </style>
diff --git a/frontend/tests/components/project/ProjectInfo.spec.ts b/frontend/tests/components/project/ProjectInfo.spec.ts
index 961a4529..a0cee26a 100644
--- a/frontend/tests/components/project/ProjectInfo.spec.ts
+++ b/frontend/tests/components/project/ProjectInfo.spec.ts
@@ -1,10 +1,30 @@
 import {mount} from "@vue/test-utils";
 import {expect, describe, it, vi} from "vitest";
 import ProjectInfo from "@/components/project/ProjectInfo.vue"
+import {ref} from "vue";
+
+const mockRouter = {
+    push: vi.fn(),
+};
+
+vi.mock("vue-router", () => ({
+    useRouter: () => mockRouter,
+}));
+
+const testAuthStore = {
+    isLoggedIn: ref(true),
+    setLoggedIn(value) {
+        this.isLoggedIn.value = value;
+    },
+};
+
+vi.mock("@/stores/auth-store", () => ({
+    useAuthStore: vi.fn(() => testAuthStore),
+}));
 
 const mockProject = {
     name: "projectname",
-    deadline: new Date(),
+    deadline: new Date(2024, 5, 31),
     id: 1,
     description: "this is a testassignment",
     capacity: 2
@@ -14,9 +34,8 @@ const mockInstructors = [
     {uid: "1", given_name: "instructor 1", surname: "Doe", is_admin: false, is_teacher: false}
 ]
 
-const mockUser = [
-    {uid: "2", given_name: "user 2", surname: "Doe 2", is_admin: false, is_teacher: false}
-]
+const mockUser = {uid: "2", given_name: "user 2", surname: "Doe 2", is_admin: false, is_teacher: false}
+
 
 const mockSubject = {
     name: "subjectname"
diff --git a/frontend/tests/views/ProjectView.spec.ts b/frontend/tests/views/ProjectView.spec.ts
index 1fe901e8..3a20da0c 100644
--- a/frontend/tests/views/ProjectView.spec.ts
+++ b/frontend/tests/views/ProjectView.spec.ts
@@ -11,7 +11,8 @@ const testProjectQuery = {
     },
     setIsLoading(value){
         this.isLoading.value = value;
-    }
+    },
+    data: ref({id: 1})
 };
 
 vi.mock('@/queries/Project', () => ({
@@ -52,10 +53,15 @@ const testSubjectInstructorsQuery = {
     },
     setIsLoading(value){
         this.isLoading.value = value;
-    }
+    },
+    data: ref([{uid: "instructor"}])
 };
 
 const testCurrentUserQuery = {
+    data: ref({id: 1, is_teacher: false, is_admin: false, uid: "student"}),
+    setTeacher(value){
+        this.data.value.is_teacher = value
+    },
     isLoading: ref(true),
     isError: ref(true),
     setIsError(value){
@@ -66,7 +72,6 @@ const testCurrentUserQuery = {
     }
 };
 
-
 vi.mock('@/queries/User', () => ({
     useCurrentUserQuery: vi.fn(() => testCurrentUserQuery),
 }));
@@ -136,4 +141,9 @@ describe("ProjectView", async () => {
         expect(wrapper.findComponent('.projectInfoComponent').exists()).toBeTruthy()
         expect(wrapper.findComponent('.projectSideBar').exists()).toBeTruthy()
     })
+    it("render if teacher", async () => {
+        testCurrentUserQuery.setTeacher(true)
+        await wrapper.vm.$nextTick()
+        expect(wrapper.text()).toContain("Alle indieningen voor dit project")
+    })
 });
diff --git a/frontend/tests/views/SubmissionsTeacherView.spec.ts b/frontend/tests/views/SubmissionsTeacherView.spec.ts
new file mode 100644
index 00000000..11a88ce7
--- /dev/null
+++ b/frontend/tests/views/SubmissionsTeacherView.spec.ts
@@ -0,0 +1,60 @@
+import { mount } from "@vue/test-utils";
+import {expect, describe, it, vi} from "vitest";
+import SubmissionsTeacherView from "../../src/views/SubmissionsTeacherView.vue"
+import {ref} from "vue";
+
+const testProjectSubmissionsQuery = {
+    data: ref([{id: 1}]),
+    isLoading: ref(false),
+    isError: ref(true),
+    error: ref({message: "error message"}),
+    setError(value){
+        this.isError.value = value
+    },
+    setData(value){
+        this.data.value = value
+    }
+}
+
+vi.mock("@/queries/Submission", () => ({
+    useProjectSubmissionsQuery: vi.fn(() => testProjectSubmissionsQuery),
+}))
+
+const testProjectQuery = {
+    data: ref({id: 1, name: "testproject", deadline: new Date(2025, 5, 31)}),
+    isLoading: ref(false)
+}
+
+vi.mock("@/queries/Project", () => ({
+    useProjectQuery: vi.fn(() => testProjectQuery)
+}))
+
+
+describe("SubmissionsTeacherView", () => {
+    const wrapper = mount(SubmissionsTeacherView, {
+        props: {
+            projectId: 1
+        },
+        global: {
+            stubs: ['SubmissionTeacherCard', 'BackButton']
+        }
+    })
+    it("render if error", async () => {
+        expect(wrapper.text()).toContain("error message")
+        testProjectSubmissionsQuery.setError(false)
+        await wrapper.vm.$nextTick()
+    });
+    it("render if submissions", async () => {
+        const text = wrapper.text()
+        expect(text).toContain("Indieningen voor project testproject")
+        expect(text).toContain("Deze pagina bevat een lijst van de laatste indiening van elke groep voor dit project.")
+        expect(text).toContain("Download alle indieningen")
+        expect(wrapper.findComponent({name: "SubmissionTeacherCard"}).exists()).toBeTruthy()
+        expect(wrapper.findComponent({name: "BackButton"}).exists()).toBeTruthy()
+        testProjectSubmissionsQuery.setData([])
+        await wrapper.vm.$nextTick()
+    });
+    it("render if no submissions", () => {
+        expect(wrapper.text()).toContain("Nog geen indieningen")
+    });
+})