diff --git a/client/src/pages/cockpit/cockpitPage/AssignmentSubmissionProgress.vue b/client/src/components/cockpit/AssignmentSubmissionProgress.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/AssignmentSubmissionProgress.vue
rename to client/src/components/cockpit/AssignmentSubmissionProgress.vue
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitDates.vue b/client/src/components/cockpit/CockpitDates.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/CockpitDates.vue
rename to client/src/components/cockpit/CockpitDates.vue
diff --git a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue b/client/src/components/cockpit/SubmissionsOverview.vue
similarity index 96%
rename from client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
rename to client/src/components/cockpit/SubmissionsOverview.vue
index 4c4ea0ac..7dc42662 100644
--- a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
+++ b/client/src/components/cockpit/SubmissionsOverview.vue
@@ -1,6 +1,6 @@
 2
 <script setup lang="ts">
-import AssignmentSubmissionProgress from "@/pages/cockpit/cockpitPage/AssignmentSubmissionProgress.vue";
+import AssignmentSubmissionProgress from "@/components/cockpit/AssignmentSubmissionProgress.vue";
 import type {
   CourseSession,
   LearningContent,
@@ -10,7 +10,7 @@ import type {
 import log from "loglevel";
 import { computed } from "vue";
 import { useTranslation } from "i18next-vue";
-import FeedbackSubmissionProgress from "@/pages/cockpit/cockpitPage/FeedbackSubmissionProgress.vue";
+import FeedbackSubmissionProgress from "@/components/cockpit/mentor/FeedbackSubmissionProgress.vue";
 import { learningContentTypeData } from "@/utils/typeMaps";
 import {
   useCourseDataWithCompletion,
diff --git a/client/src/pages/cockpit/cockpitPage/UserStatusCount.vue b/client/src/components/cockpit/UserStatusCount.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/UserStatusCount.vue
rename to client/src/components/cockpit/UserStatusCount.vue
diff --git a/client/src/pages/cockpit/cockpitPage/FeedbackSubmissionProgress.vue b/client/src/components/cockpit/mentor/FeedbackSubmissionProgress.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/FeedbackSubmissionProgress.vue
rename to client/src/components/cockpit/mentor/FeedbackSubmissionProgress.vue
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/components/learningPath/SelfEvaluation.vue
similarity index 94%
rename from client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
rename to client/src/components/learningPath/SelfEvaluation.vue
index e9c59ea3..a0f46a5f 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
+++ b/client/src/components/learningPath/SelfEvaluation.vue
@@ -11,7 +11,7 @@ import { useRouteQuery } from "@vueuse/router";
 import { computed, onUnmounted } from "vue";
 import { getPreviousRoute } from "@/router/history";
 import { getCompetenceNaviUrl } from "@/utils/utils";
-import SelfEvaluationSubmit from "@/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue";
+import SelfEvaluationRequestFeedbackPage from "@/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue";
 
 log.debug("LearningContent.vue setup");
 
@@ -42,10 +42,12 @@ const learningUnitHasFeedbackPage = computed(
 
 const currentQuestion = computed(() => questions.value[questionIndex.value]);
 const showPreviousButton = computed(() => questionIndex.value != 0);
+
 const showNextButton = computed(
   () => questionIndex.value + 1 < numPages.value && numPages.value > 1
 );
-const showExitButton = computed(
+
+const isLastStep = computed(
   () => questions.value?.length === 1 || numPages.value == questionIndex.value + 1
 );
 
@@ -99,7 +101,7 @@ onUnmounted(() => {
         icon="it-icon-lc-learning-module"
         :steps-count="numPages"
         :show-next-button="showNextButton"
-        :show-exit-button="showExitButton"
+        :show-exit-button="isLastStep"
         :show-start-button="false"
         :show-previous-button="showPreviousButton"
         :base-url="props.learningUnit.evaluate_url"
@@ -160,8 +162,8 @@ onUnmounted(() => {
             </div>
           </div>
         </div>
-        <SelfEvaluationSubmit
-          v-else
+        <SelfEvaluationRequestFeedbackPage
+          v-else-if="isLastStep && learningUnit.feedback_user == 'MENTOR_FEEDBACK'"
           :learning-unit="props.learningUnit"
           :criteria="questions"
         />
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 6d8def82..69a5327d 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -11,7 +11,7 @@ import type {
 } from "@/types";
 import log from "loglevel";
 import { computed, onMounted, reactive } from "vue";
-import AssignmentSubmissionProgress from "@/pages/cockpit/cockpitPage/AssignmentSubmissionProgress.vue";
+import AssignmentSubmissionProgress from "@/components/cockpit/AssignmentSubmissionProgress.vue";
 import { useCourseSessionDetailQuery } from "@/composables";
 import { formatDueDate } from "../../../components/dueDates/dueDatesUtils";
 import { stringifyParse } from "@/utils/utils";
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
index 004619a1..e109d901 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
@@ -3,12 +3,12 @@ import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.v
 import ItPersonRow from "@/components/ui/ItPersonRow.vue";
 
 import { useCourseSessionDetailQuery, useCurrentCourseSession } from "@/composables";
-import SubmissionsOverview from "@/pages/cockpit/cockpitPage/SubmissionsOverview.vue";
+import SubmissionsOverview from "@/components/cockpit/SubmissionsOverview.vue";
 import { useExpertCockpitStore } from "@/stores/expertCockpit";
 import log from "loglevel";
-import CockpitDates from "@/pages/cockpit/cockpitPage/CockpitDates.vue";
+import CockpitDates from "@/components/cockpit/CockpitDates.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import UserStatusCount from "@/pages/cockpit/cockpitPage/UserStatusCount.vue";
+import UserStatusCount from "@/components/cockpit/UserStatusCount.vue";
 import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
 
 const props = defineProps<{
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorOverview.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorOverviewPage.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/mentor/MentorOverview.vue
rename to client/src/pages/cockpit/cockpitPage/mentor/MentorOverviewPage.vue
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue
rename to client/src/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignmentPage.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
rename to client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignmentPage.vue
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
similarity index 100%
rename from client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue
rename to client/src/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedback.vue b/client/src/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedbackPage.vue
similarity index 97%
rename from client/src/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedback.vue
rename to client/src/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedbackPage.vue
index d04695e2..e58125a2 100644
--- a/client/src/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedback.vue
+++ b/client/src/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedbackPage.vue
@@ -10,6 +10,7 @@ import {
 import { useRouteQuery } from "@vueuse/router";
 import FeedbackProviderRankCriteria from "@/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue";
 import FeedbackProviderReleaseOverview from "@/components/selfEvaluationFeedback/FeedbackProviderReleaseOverview.vue";
+import log from "loglevel";
 
 const router = useRouter();
 const props = defineProps<{
@@ -33,7 +34,7 @@ watch(
   () => feedback.value,
   () => {
     if (feedback.value && feedback.value.feedback_submitted) {
-      console.info("Feedback submitted, redirecting to overview page!");
+      log.info("Feedback submitted, redirecting to overview page!");
       router.push({
         name: "mentorSelfEvaluationFeedback",
         params: {
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationPage.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationPage.vue
index 2c55f468..3fabaef7 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationPage.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import * as log from "loglevel";
 
-import SelfEvaluation from "@/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue";
+import SelfEvaluation from "@/components/learningPath/SelfEvaluation.vue";
 import { computed } from "vue";
 import { useCourseDataWithCompletion } from "@/composables";
 
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
similarity index 100%
rename from client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedback.vue
rename to client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 5c8791f1..19094a12 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -180,7 +180,7 @@ const router = createRouter({
             {
               path: "",
               component: () =>
-                import("@/pages/cockpit/cockpitPage/mentor/MentorOverview.vue"),
+                import("@/pages/cockpit/cockpitPage/mentor/MentorOverviewPage.vue"),
               name: "mentorCockpitOverview",
               meta: {
                 cockpitType: "mentor",
@@ -189,7 +189,7 @@ const router = createRouter({
             {
               path: "participants",
               component: () =>
-                import("@/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue"),
+                import("@/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue"),
               name: "mentorCockpitParticipants",
               meta: {
                 cockpitType: "mentor",
@@ -198,7 +198,9 @@ const router = createRouter({
             {
               path: "self-evaluation-feedback/:learningUnitId",
               component: () =>
-                import("@/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedback.vue"),
+                import(
+                  "@/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedbackPage.vue"
+                ),
               name: "mentorSelfEvaluationFeedback",
               meta: {
                 cockpitType: "mentor",
@@ -217,7 +219,7 @@ const router = createRouter({
                   path: "praxis-assignments/:praxisAssignmentId",
                   component: () =>
                     import(
-                      "@/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue"
+                      "@/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignmentPage.vue"
                     ),
                   name: "mentorCockpitPraxisAssignments",
                   meta: {
@@ -229,7 +231,7 @@ const router = createRouter({
                   path: "self-evaluation-feedback-assignments/:learningUnitId",
                   component: () =>
                     import(
-                      "@/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignment.vue"
+                      "@/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue"
                     ),
                   name: "mentorCockpitSelfEvaluationFeedbackAssignments",
                   meta: {
diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py
index 5f79aec2..e0560d34 100644
--- a/server/vbv_lernwelt/core/create_default_users.py
+++ b/server/vbv_lernwelt/core/create_default_users.py
@@ -13,9 +13,9 @@ from vbv_lernwelt.core.constants import (
     ADMIN_USER_ID,
     TEST_MENTOR1_USER_ID,
     TEST_STUDENT1_USER_ID,
+    TEST_STUDENT1_VV_USER_ID,
     TEST_STUDENT2_USER_ID,
     TEST_STUDENT3_USER_ID,
-    TEST_STUDENT1_VV_USER_ID,
     TEST_SUPERVISOR1_USER_ID,
     TEST_TRAINER1_USER_ID,
     TEST_TRAINER2_USER_ID,