diff --git a/client/src/components/FeedbackForm.vue b/client/src/components/FeedbackForm.vue
index 7cd1e9db..facbb4dd 100644
--- a/client/src/components/FeedbackForm.vue
+++ b/client/src/components/FeedbackForm.vue
@@ -1,3 +1,133 @@
+<script setup lang="ts">
+import ItRadioGroup from "@/components/ui/ItRadioGroup.vue";
+import ItTextarea from "@/components/ui/ItTextarea.vue";
+import { graphql } from "@/gql/";
+import type { SendFeedbackInput } from "@/gql/graphql";
+import FeedbackCompletition from "@/pages/learningPath/learningContentPage/feedback/FeedbackCompletition.vue";
+import {
+  PERCENTAGES,
+  RATINGS,
+  YES_NO,
+} from "@/pages/learningPath/learningContentPage/feedback/feedback.constants";
+import LearningContentMultiLayout from "@/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue";
+import { useCircleStore } from "@/stores/circle";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
+import type { LearningContent } from "@/types";
+import { useMutation } from "@urql/vue";
+import { useRouteQuery } from "@vueuse/router";
+import log from "loglevel";
+import { computed, onMounted, reactive, ref } from "vue";
+import { useI18n } from "vue-i18n";
+
+const props = defineProps<{ page: LearningContent }>();
+const courseSessionsStore = useCourseSessionsStore();
+const circleStore = useCircleStore();
+const { t } = useI18n();
+
+onMounted(async () => {
+  log.debug("Feedback mounted");
+});
+
+const stepNo = useRouteQuery("step", "0", { transform: Number, mode: "push" });
+
+const title = computed(
+  () => `«${circleStore.circle?.title}»: ${t("feedback.areYouSatisfied")}`
+);
+
+const stepLabels = [
+  t("general.introduction"),
+  t("feedback.satisfactionLabel"),
+  t("feedback.goalAttainmentLabel"),
+  t("feedback.proficiencyLabel"),
+  t("feedback.preparationTaskClarityLabel"),
+  t("feedback.instructorCompetenceLabel"),
+  t("feedback.instructorRespectLabel"),
+  t("feedback.instructorOpenFeedbackLabel"),
+  t("feedback.recommendLabel"),
+  t("feedback.courseNegativeFeedbackLabel"),
+  t("feedback.coursePositiveFeedbackLabel"),
+  t("general.submission"),
+];
+
+const numSteps = stepLabels.length;
+
+const sendFeedbackMutation = graphql(`
+  mutation SendFeedbackMutation($input: SendFeedbackInput!) {
+    sendFeedback(input: $input) {
+      feedbackResponse {
+        id
+      }
+      errors {
+        field
+        messages
+      }
+    }
+  }
+`);
+const { executeMutation } = useMutation(sendFeedbackMutation);
+
+const satisfaction = ref(null);
+const goalAttainment = ref(null);
+const proficiency = ref(null);
+const preparationTaskClarity = ref(null);
+const instructorCompetence = ref(null);
+const instructorRespect = ref(null);
+const instructorOpenFeedback = ref("");
+const wouldRecommend = ref(null);
+const courseNegativeFeedback = ref("");
+const coursePositiveFeedback = ref("");
+
+const mutationResult = ref<any>(null);
+
+const previousStep = () => {
+  if (stepNo.value > 0) {
+    stepNo.value -= 1;
+  }
+};
+const nextStep = () => {
+  if (stepNo.value < numSteps) {
+    stepNo.value += 1;
+  }
+  log.info(`next step ${stepNo.value} of ${numSteps}`);
+};
+
+const sendFeedback = () => {
+  log.info("sending feedback");
+  const courseSession = courseSessionsStore.currentCourseSession;
+  if (!courseSession || !courseSession.id) {
+    log.error("no course session set");
+    return;
+  }
+  const input: SendFeedbackInput = reactive({
+    data: {
+      preparation_task_clarity: preparationTaskClarity,
+      course_negative_feedback: courseNegativeFeedback,
+      course_positive_feedback: coursePositiveFeedback,
+      goald_attainment: goalAttainment,
+      instructor_competence: instructorCompetence,
+      instructor_respect: instructorRespect,
+      instructor_open_feedback: instructorOpenFeedback,
+      satisfaction,
+      proficiency,
+      would_recommend: wouldRecommend,
+    },
+    page: props.page.translation_key,
+    courseSession: courseSession.id,
+  });
+  const variables = reactive({
+    input,
+  });
+  log.debug(variables);
+  executeMutation(variables)
+    .then(({ data, error }) => {
+      log.debug(data);
+      log.error(error);
+      mutationResult.value = data;
+    })
+    .catch((e) => log.error(e));
+};
+</script>
+
 <template>
   <LearningContentMultiLayout
     :title="title"
@@ -11,10 +141,11 @@
     :steps-count="numSteps"
     :start-badge-text="$t('general.introduction')"
     :end-badge-text="$t('general.submission')"
+    :base-url="props.page.frontend_url"
     @previous="previousStep()"
     @next="nextStep()"
   >
-    <div class="container-medium">
+    <div>
       <p v-if="stepNo === 0" class="mt-10">
         {{
           $t("feedback.intro", {
@@ -27,51 +158,47 @@
       </p>
       <ItRadioGroup
         v-if="stepNo === 1"
-        v-model="wouldRecommend"
-        class="mb-8"
-        :items="YES_NO"
-      />
-      <ItRadioGroup
-        v-if="stepNo === 2"
         v-model="satisfaction"
         class="mb-8"
         :items="RATINGS"
       />
       <ItRadioGroup
-        v-if="stepNo === 3"
+        v-if="stepNo === 2"
         v-model="goalAttainment"
         class="mb-8"
         :items="RATINGS"
       />
       <ItRadioGroup
-        v-if="stepNo === 4"
+        v-if="stepNo === 3"
         v-model="proficiency"
         class="mb-8"
         :items="PERCENTAGES"
       />
       <ItRadioGroup
-        v-if="stepNo === 5"
-        v-model="receivedMaterials"
+        v-if="stepNo === 4"
+        v-model="preparationTaskClarity"
         class="mb-8"
         :items="YES_NO"
       />
-      <div v-if="stepNo === 5 && receivedMaterials">
-        <p class="pb-2">{{ t("feedback.materialsRatingLabel") }}</p>
-        <ItRadioGroup v-model="materialsRating" class="mb-8" :items="RATINGS" />
-      </div>
       <ItRadioGroup
-        v-if="stepNo === 6"
+        v-if="stepNo === 5"
         v-model="instructorCompetence"
         class="mb-8"
         :items="RATINGS"
       />
       <ItRadioGroup
-        v-if="stepNo === 7"
+        v-if="stepNo === 6"
         v-model="instructorRespect"
         class="mb-8"
         :items="RATINGS"
       />
-      <ItTextarea v-if="stepNo === 8" v-model="instructorOpenFeedback" class="mb-8" />
+      <ItTextarea v-if="stepNo === 7" v-model="instructorOpenFeedback" class="mb-8" />
+      <ItRadioGroup
+        v-if="stepNo === 8"
+        v-model="wouldRecommend"
+        class="mb-8"
+        :items="YES_NO"
+      />
       <ItTextarea v-if="stepNo === 9" v-model="courseNegativeFeedback" class="mb-8" />
       <ItTextarea v-if="stepNo === 10" v-model="coursePositiveFeedback" class="mb-8" />
       <FeedbackCompletition
@@ -104,134 +231,3 @@
    mutationResult: {{ mutationResult }}
   </pre> -->
 </template>
-
-<script setup lang="ts">
-import ItRadioGroup from "@/components/ui/ItRadioGroup.vue";
-import ItTextarea from "@/components/ui/ItTextarea.vue";
-import { graphql } from "@/gql/";
-import type { SendFeedbackInput } from "@/gql/graphql";
-import FeedbackCompletition from "@/pages/learningPath/learningContentPage/feedback/FeedbackCompletition.vue";
-import {
-  PERCENTAGES,
-  RATINGS,
-  YES_NO,
-} from "@/pages/learningPath/learningContentPage/feedback/feedback.constants";
-import LearningContentMultiLayout from "@/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue";
-import { useCircleStore } from "@/stores/circle";
-import { useCourseSessionsStore } from "@/stores/courseSessions";
-import type { LearningContent } from "@/types";
-import { useMutation } from "@urql/vue";
-import log from "loglevel";
-import { computed, onMounted, reactive, ref } from "vue";
-import { useI18n } from "vue-i18n";
-
-const props = defineProps<{ page: LearningContent }>();
-const courseSessionsStore = useCourseSessionsStore();
-const circleStore = useCircleStore();
-const { t } = useI18n();
-
-onMounted(async () => {
-  log.debug("Feedback mounted");
-});
-
-const stepNo = ref(0);
-
-const title = computed(
-  () => `«${circleStore.circle?.title}»: ${t("feedback.areYouSatisfied")}`
-);
-
-const stepLabels = [
-  t("general.introduction"),
-  t("feedback.recommendLabel"),
-  t("feedback.satisfactionLabel"),
-  t("feedback.goalAttainmentLabel"),
-  t("feedback.proficiencyLabel"),
-  t("feedback.receivedMaterialsLabel"),
-  t("feedback.instructorCompetenceLabel"),
-  t("feedback.instructorRespectLabel"),
-  t("feedback.instructorOpenFeedbackLabel"),
-  t("feedback.courseNegativeFeedbackLabel"),
-  t("feedback.coursePositiveFeedbackLabel"),
-  t("general.submission"),
-];
-
-const numSteps = stepLabels.length;
-
-const sendFeedbackMutation = graphql(`
-  mutation SendFeedbackMutation($input: SendFeedbackInput!) {
-    sendFeedback(input: $input) {
-      feedbackResponse {
-        id
-      }
-      errors {
-        field
-        messages
-      }
-    }
-  }
-`);
-const { executeMutation } = useMutation(sendFeedbackMutation);
-
-const satisfaction = ref(null);
-const goalAttainment = ref(null);
-const wouldRecommend = ref(null);
-const proficiency = ref(null);
-const receivedMaterials = ref(null);
-const materialsRating = ref(null);
-const instructorCompetence = ref(null);
-const instructorRespect = ref(null);
-const coursePositiveFeedback = ref("");
-const courseNegativeFeedback = ref("");
-const instructorOpenFeedback = ref("");
-
-const mutationResult = ref<any>(null);
-
-const previousStep = () => {
-  if (stepNo.value > 0) {
-    stepNo.value -= 1;
-  }
-};
-const nextStep = () => {
-  if (stepNo.value < numSteps) {
-    stepNo.value += 1;
-  }
-  log.info(`next step ${stepNo.value} of ${numSteps}`);
-};
-
-const sendFeedback = () => {
-  log.info("sending feedback");
-  const courseSession = courseSessionsStore.currentCourseSession;
-  if (!courseSession || !courseSession.id) {
-    log.error("no course session set");
-    return;
-  }
-  const input: SendFeedbackInput = reactive({
-    data: {
-      materials_rating: materialsRating,
-      course_negative_feedback: courseNegativeFeedback,
-      course_positive_feedback: coursePositiveFeedback,
-      goald_attainment: goalAttainment,
-      instructor_competence: instructorCompetence,
-      instructor_respect: instructorRespect,
-      instructor_open_feedback: instructorOpenFeedback,
-      satisfaction,
-      proficiency,
-      received_materials: receivedMaterials,
-      would_recommend: wouldRecommend,
-    },
-    page: props.page.translation_key,
-    courseSession: courseSession.id,
-  });
-  const variables = reactive({
-    input,
-  });
-  log.debug(variables);
-  executeMutation(variables)
-    .then(({ data, error }) => {
-      log.debug(data);
-      log.error(error);
-      mutationResult.value = data;
-    })
-    .catch((e) => log.error(e));
-};
-</script>
diff --git a/client/src/components/ui/ItNavigationProgress.vue b/client/src/components/ui/ItNavigationProgress.vue
index ebd9e595..03b06ca5 100644
--- a/client/src/components/ui/ItNavigationProgress.vue
+++ b/client/src/components/ui/ItNavigationProgress.vue
@@ -9,14 +9,14 @@ export interface Props {
   startBadgeText?: string;
   endBadgeText?: string;
   baseUrl?: string;
-  queryParam?: string;
+  stepQueryParam?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   startBadgeText: undefined,
   endBadgeText: undefined,
   baseUrl: undefined,
-  queryParam: "page",
+  stepQueryParam: "step",
 });
 
 const hasStartBadge = computed(() => typeof props.startBadgeText !== "undefined");
@@ -67,7 +67,10 @@ function calcStepIndex(step: number) {
       :class="startBadgeClasses"
       data-cy="nav-progress-step-start"
     >
-      <router-link v-if="props.baseUrl" :to="`${props.baseUrl}?${props.queryParam}=0`">
+      <router-link
+        v-if="props.baseUrl"
+        :to="`${props.baseUrl}?${props.stepQueryParam}=0`"
+      >
         {{ props.startBadgeText }}
       </router-link>
       <span v-else>{{ props.startBadgeText }}</span>
@@ -84,7 +87,7 @@ function calcStepIndex(step: number) {
       >
         <router-link
           v-if="props.baseUrl"
-          :to="`${props.baseUrl}?${props.queryParam}=${calcStepIndex(step)}`"
+          :to="`${props.baseUrl}?${props.stepQueryParam}=${calcStepIndex(step)}`"
         >
           {{ step + 1 }}
         </router-link>
@@ -100,7 +103,7 @@ function calcStepIndex(step: number) {
     >
       <router-link
         v-if="props.baseUrl"
-        :to="`${props.baseUrl}?${props.queryParam}=${steps - 1}`"
+        :to="`${props.baseUrl}?${props.stepQueryParam}=${steps - 1}`"
       >
         {{ props.endBadgeText }}
       </router-link>
diff --git a/client/src/locales/de.json b/client/src/locales/de.json
index 6d1fb2ed..b6f0a240 100644
--- a/client/src/locales/de.json
+++ b/client/src/locales/de.json
@@ -87,23 +87,23 @@
     "circleFeedback": "Feedback zum Circle",
     "completionDescription": "Dein Feedback ist anonym. Dein Vor- und Nachname werden bei deiner Trainer/-in nicht angezeigt.",
     "completionTitle": "Schicke dein Feedback an {name}",
-    "courseNegativeFeedbackLabel": "Wo sehen Sie Verbesserungspotenzial?",
-    "coursePositiveFeedbackLabel": "Was hat Ihnen besonders gut gefallen?",
+    "courseNegativeFeedbackLabel": "Wo siehst du Verbesserungspotential?",
+    "coursePositiveFeedbackLabel": "Was hat dir besonders gut gefallen?",
     "feedbackPageInfo": "Teilnehmer haben das Feedback ausgefüllt",
     "feedbackPageTitle": "Feedback zum Lehrgang",
     "feedbackSent": "Dein Feedback wurde abgeschickt",
     "goalAttainmentLabel": "Zielerreichung insgesamt",
     "happy": "Zufrieden",
-    "instructorCompetenceLabel": "Der Kursleiter war themenstark, fachkompetent.",
-    "instructorOpenFeedbackLabel": "Was ich dem Kursleiter sonst noch sagen wollte:",
-    "instructorRespectLabel": "Fragen und Anregungen der Kursteilnehmenden wurden ernst genommen und aufgegriffen.",
+    "instructorCompetenceLabel": "Wie beurteilst du die Themensicherheit und Fachkompetenz des Kursleiters/der Kursleiterin?",
+    "instructorOpenFeedbackLabel": "Was möchtest du dem Kursleiter/der Kursleiterin sonst noch sagen?",
+    "instructorRespectLabel": "Wurden Fragen und Anregungen der Kursteilnehmenden ernst genommen und aufgegriffen?",
     "intro": "{name}, dein/e Trainer/-in, bittet dich, ihm/ihr Feedback zu geben. Das ist freiwillig, würde aber ihm/ihr helfen, deine Lernerlebniss zu verbessern.",
     "materialsRatingLabel": "Falls ja: Wie beurteilen Sie die Vorbereitungsunterlagen (z.B. eLearning)?",
     "noFeedbacks": "Es wurden noch keine Feedbacks abgegeben",
-    "proficiencyLabel": "Wie beurteilen Sie Ihre Sicherheit bezüglichen den Themen nach dem Kurs?",
+    "preparationTaskClarityLabel": "Waren die Vorbereitungsaufträge klar und verständlich?",
+    "proficiencyLabel": "Wie beurteilst du deine Sicherheit bezüglichen den Themen nach dem Kurs?",
     "questionTitle": "Frage",
-    "receivedMaterialsLabel": "Haben Sie Vorbereitungsunterlagen (z.B. eLearning) erhalten?",
-    "recommendLabel": "Würden Sie den Kurs weiterempfehlen?",
+    "recommendLabel": "Würdest du den Kurs weiterempfehlen?",
     "satisfactionLabel": "Zufriedenheit insgesamt",
     "sendFeedback": "Feedback abschicken",
     "sentByUsers": "Von {count} Teilnehmern ausgefüllt",
diff --git a/client/src/pages/cockpit/FeedbackPage.vue b/client/src/pages/cockpit/FeedbackPage.vue
index 63b5eb58..9e0dbc9f 100644
--- a/client/src/pages/cockpit/FeedbackPage.vue
+++ b/client/src/pages/cockpit/FeedbackPage.vue
@@ -83,10 +83,6 @@ const courseSessionsStore = useCourseSessionsStore();
 const { t } = useI18n();
 
 const orderedQuestions = [
-  {
-    key: "would_recommend",
-    question: t("feedback.recommendLabel"),
-  },
   {
     key: "satisfaction",
     question: t("feedback.satisfactionLabel"),
@@ -100,12 +96,8 @@ const orderedQuestions = [
     question: t("feedback.proficiencyLabel"),
   },
   {
-    key: "received_materials",
-    question: t("feedback.receivedMaterialsLabel"),
-  },
-  {
-    key: "materials_rating",
-    question: t("feedback.materialsRatingLabel"),
+    key: "preparation_task_clarity",
+    question: t("feedback.preparationTaskClarityLabel"),
   },
   {
     key: "instructor_competence",
@@ -119,6 +111,10 @@ const orderedQuestions = [
     key: "instructor_open_feedback",
     question: t("feedback.instructorOpenFeedbackLabel"),
   },
+  {
+    key: "would_recommend",
+    question: t("feedback.recommendLabel"),
+  },
   {
     key: "course_negative_feedback",
     question: t("feedback.courseNegativeFeedbackLabel"),
@@ -132,11 +128,10 @@ const orderedQuestions = [
 const ratingKeys = [
   "satisfaction",
   "goal_attainment",
-  "materials_rating",
   "instructor_competence",
   "instructor_respect",
 ];
-const verticalChartKyes = ["received_materials", "would_recommend"];
+const verticalChartKyes = ["preparation_task_clarity", "would_recommend"];
 const horizontalChartKeys = ["proficiency"];
 const openKeys = [
   "course_negative_feedback",
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 45579a4b..1df4d380 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -9,10 +9,11 @@ import type {
   AssignmentEvaluationTask,
   CourseSessionUser,
 } from "@/types";
+import { useRouteQuery } from "@vueuse/router";
 import dayjs from "dayjs";
 import { findIndex } from "lodash";
 import * as log from "loglevel";
-import { computed, onMounted, reactive } from "vue";
+import { computed, onMounted } from "vue";
 
 const props = defineProps<{
   assignmentUser: CourseSessionUser;
@@ -24,14 +25,8 @@ const emit = defineEmits(["close"]);
 
 log.debug("UserEvaluation setup");
 
-interface StateInterface {
-  // 0 = introduction, 1 - n = tasks, n+1 = submission
-  pageIndex: number;
-}
-
-const state: StateInterface = reactive({
-  pageIndex: 0,
-});
+// 0 = introduction, 1 - n = tasks, n+1 = submission
+const stepIndex = useRouteQuery("step", "0", { transform: Number, mode: "push" });
 
 const assignmentStore = useAssignmentStore();
 
@@ -41,21 +36,19 @@ const evaluationSubmitted = computed(
 );
 
 onMounted(() => {
-  if (evaluationSubmitted.value) {
-    state.pageIndex = props.assignment.evaluation_tasks?.length + 1 ?? 0;
-  } else {
-    state.pageIndex = 0;
+  if (stepIndex.value === 0 && evaluationSubmitted.value) {
+    stepIndex.value = props.assignment.evaluation_tasks?.length + 1 ?? 0;
   }
 });
 
 function previousPage() {
   log.debug("previousTask");
-  state.pageIndex = Math.max(0, state.pageIndex - 1);
+  stepIndex.value = Math.max(0, stepIndex.value - 1);
 }
 
 function nextPage() {
   log.debug("nextTask");
-  state.pageIndex = Math.min(numTasks.value + 1, state.pageIndex + 1);
+  stepIndex.value = Math.min(numTasks.value + 1, stepIndex.value + 1);
 }
 
 function editTask(task: AssignmentEvaluationTask) {
@@ -64,7 +57,7 @@ function editTask(task: AssignmentEvaluationTask) {
     findIndex(props.assignment.evaluation_tasks, {
       id: task.id,
     }) ?? 0;
-  state.pageIndex = taskIndex + 1;
+  stepIndex.value = taskIndex + 1;
 }
 
 const assignmentDetail = computed(() =>
@@ -76,9 +69,9 @@ const dueDate = computed(() =>
 );
 
 const inEvaluationTask = computed(
-  () => state.pageIndex >= 1 && state.pageIndex <= numTasks.value
+  () => stepIndex.value >= 1 && stepIndex.value <= numTasks.value
 );
-const taskIndex = computed(() => state.pageIndex - 1);
+const taskIndex = computed(() => stepIndex.value - 1);
 const task = computed(() => props.assignment.evaluation_tasks[taskIndex.value]);
 
 const taskExpertDataText = computed(() => {
@@ -108,7 +101,7 @@ function finishButtonEnabled() {
     <div class="flex-1 overflow-y-auto">
       <section class="p-10">
         <EvaluationIntro
-          v-if="state.pageIndex === 0"
+          v-if="stepIndex === 0"
           :assignment-user="props.assignmentUser"
           :assignment="props.assignment"
           :assignment-completion="props.assignmentCompletion"
@@ -119,7 +112,7 @@ function finishButtonEnabled() {
           v-else-if="inEvaluationTask"
           :assignment-user="props.assignmentUser"
           :assignment="props.assignment"
-          :task-index="state.pageIndex - 1"
+          :task-index="stepIndex - 1"
           :allow-edit="
             props.assignmentCompletion.completion_status !== 'evaluation_submitted'
           "
@@ -135,7 +128,7 @@ function finishButtonEnabled() {
       </section>
     </div>
 
-    <nav v-if="state.pageIndex > 0" class="sticky bottom-0 border-t bg-gray-200 p-6">
+    <nav v-if="stepIndex > 0" class="sticky bottom-0 border-t bg-gray-200 p-6">
       <div class="relative flex flex-row place-content-end">
         <button
           v-if="true"
@@ -147,7 +140,7 @@ function finishButtonEnabled() {
           {{ $t("general.backCapitalized") }}
         </button>
         <button
-          v-if="state.pageIndex <= numTasks"
+          v-if="stepIndex <= numTasks"
           :disabled="!nextButtonEnabled()"
           class="btn-secondary z-10 flex items-center"
           data-cy="next-step"
@@ -158,7 +151,7 @@ function finishButtonEnabled() {
         </button>
 
         <button
-          v-if="state.pageIndex > numTasks"
+          v-if="stepIndex > numTasks"
           :disabled="!finishButtonEnabled()"
           class="btn-secondary z-10"
           data-cy="next-step"
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index 27123bb0..9b1eb527 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -41,7 +41,7 @@ const props = defineProps<{
 }>();
 
 // 0 = introduction, 1 - n = tasks, n+1 = submission
-const pageIndex = useRouteQuery("page", "0", { transform: Number, mode: "push" });
+const stepIndex = useRouteQuery("step", "0", { transform: Number, mode: "push" });
 
 const assignmentCompletion = computed(() => assignmentStore.assignmentCompletion);
 const completionStatus = computed(() => {
@@ -64,10 +64,10 @@ onMounted(async () => {
     );
 
     if (
-      pageIndex.value === 0 &&
+      stepIndex.value === 0 &&
       (completionStatus.value ?? "in_progress") !== "in_progress"
     ) {
-      pageIndex.value = numPages.value - 1;
+      stepIndex.value = numPages.value - 1;
     }
   } catch (error) {
     log.error(error);
@@ -76,9 +76,9 @@ onMounted(async () => {
 
 const numTasks = computed(() => state.assignment?.tasks?.length ?? 0);
 const numPages = computed(() => numTasks.value + 2);
-const showPreviousButton = computed(() => pageIndex.value != 0);
-const showNextButton = computed(() => pageIndex.value + 1 < numPages.value);
-const showExitButton = computed(() => numPages.value === pageIndex.value + 1);
+const showPreviousButton = computed(() => stepIndex.value != 0);
+const showNextButton = computed(() => stepIndex.value + 1 < numPages.value);
+const showExitButton = computed(() => numPages.value === stepIndex.value + 1);
 const dueDate = computed(() =>
   dayjs(state.courseSessionAssignmentDetails?.submissionDeadlineDateTimeUtc)
 );
@@ -86,41 +86,41 @@ const courseSessionId = computed(
   () => courseSessionsStore.currentCourseSession?.id ?? 0
 );
 const currentTask = computed(() => {
-  if (pageIndex.value > 0 && pageIndex.value <= numTasks.value) {
-    return state.assignment?.tasks[pageIndex.value - 1];
+  if (stepIndex.value > 0 && stepIndex.value <= numTasks.value) {
+    return state.assignment?.tasks[stepIndex.value - 1];
   }
   return undefined;
 });
 
 const handleBack = () => {
   log.debug("handleBack");
-  if (pageIndex.value > 0) {
-    pageIndex.value -= 1;
+  if (stepIndex.value > 0) {
+    stepIndex.value -= 1;
   }
-  log.debug(`pageIndex: ${pageIndex.value}`);
+  log.debug(`pageIndex: ${stepIndex.value}`);
 };
 
 const handleContinue = () => {
   log.debug("handleContinue");
-  if (pageIndex.value + 1 < numPages.value) {
-    pageIndex.value += 1;
+  if (stepIndex.value + 1 < numPages.value) {
+    stepIndex.value += 1;
   }
-  log.debug(`pageIndex: ${pageIndex.value}`);
+  log.debug(`pageIndex: ${stepIndex.value}`);
 };
 
 const jumpToTask = (task: AssignmentTask) => {
   log.debug("jumpToTask", task);
   const index = state.assignment?.tasks.findIndex((t) => t.id === task.id);
   if (index && index >= 0) {
-    pageIndex.value = index + 1;
+    stepIndex.value = index + 1;
   }
-  log.debug(`pageIndex: ${pageIndex.value}`);
+  log.debug(`pageIndex: ${stepIndex.value}`);
 };
 
 const getTitle = () => {
-  if (0 === pageIndex.value) {
+  if (0 === stepIndex.value) {
     return t("general.introduction");
-  } else if (pageIndex.value === numPages.value - 1) {
+  } else if (stepIndex.value === numPages.value - 1) {
     return t("general.submission");
   }
   return currentTask?.value?.value.title ?? "Unknown";
@@ -137,7 +137,7 @@ const assignmentUser = computed(() => {
   <div v-if="state.assignment">
     <div class="flex">
       <LearningContentMultiLayout
-        :current-step="pageIndex"
+        :current-step="stepIndex"
         :subtitle="state.assignment?.title ?? ''"
         :title="getTitle()"
         learning-content-type="assignment"
@@ -147,7 +147,7 @@ const assignmentUser = computed(() => {
         :show-start-button="false"
         :show-previous-button="showPreviousButton"
         :base-url="props.learningContent.frontend_url"
-        query-param="page"
+        step-query-param="step"
         start-badge-text="Einleitung"
         end-badge-text="Abgabe"
         close-button-variant="close"
@@ -157,7 +157,7 @@ const assignmentUser = computed(() => {
         <div class="flex">
           <div>
             <AssignmentIntroductionView
-              v-if="pageIndex === 0 && state.assignment"
+              v-if="stepIndex === 0 && state.assignment"
               :due-date="dueDate"
               :assignment="state.assignment!"
             ></AssignmentIntroductionView>
@@ -167,7 +167,7 @@ const assignmentUser = computed(() => {
               :assignment-id="props.assignmentId"
             ></AssignmentTaskView>
             <AssignmentSubmissionView
-              v-if="pageIndex + 1 === numPages && state.assignment && courseSessionId"
+              v-if="stepIndex + 1 === numPages && state.assignment && courseSessionId"
               :due-date="dueDate"
               :assignment="state.assignment!"
               :assignment-completion-data="assignmentCompletion?.completion_data ?? {}"
diff --git a/client/src/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue b/client/src/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue
index 9c26bf72..efd966e1 100644
--- a/client/src/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue
+++ b/client/src/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue
@@ -20,7 +20,7 @@ interface Props {
   endBadgeText?: string;
   closeButtonVariant?: ClosingButtonVariant;
   baseUrl?: string;
-  queryParam?: string;
+  stepQueryParam?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -58,7 +58,7 @@ const emit = defineEmits(["previous", "next", "exit"]);
       :steps="stepsCount"
       :end-badge-text="props.endBadgeText"
       :base-url="props.baseUrl"
-      :query-param="props.queryParam"
+      :query-param="props.stepQueryParam"
       class="overflow-hidden pb-12"
     ></ItNavigationProgress>
     <slot></slot>
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
index 74d66c01..793c50e0 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
@@ -8,37 +8,36 @@ import LearningContentContainer from "@/pages/learningPath/learningContentPage/L
 import LearningContentMultiLayout from "@/pages/learningPath/learningContentPage/layouts/LearningContentMultiLayout.vue";
 import { useCourseSessionsStore } from "@/stores/courseSessions";
 import eventBus from "@/utils/eventBus";
-import { computed, onUnmounted, reactive } from "vue";
+import { useRouteQuery } from "@vueuse/router";
+import { computed, onUnmounted } from "vue";
 
 log.debug("LearningContent.vue setup");
 
 const circleStore = useCircleStore();
 const courseSession = useCourseSessionsStore();
 
-const state = reactive({
-  questionIndex: 0,
-});
+const questionIndex = useRouteQuery("step", "0", { transform: Number, mode: "push" });
 
 const props = defineProps<{
   learningUnit: LearningUnit;
 }>();
 
 const questions = computed(() => props.learningUnit?.children);
-const currentQuestion = computed(() => questions.value[state.questionIndex]);
-const showPreviousButton = computed(() => state.questionIndex != 0);
+const currentQuestion = computed(() => questions.value[questionIndex.value]);
+const showPreviousButton = computed(() => questionIndex.value != 0);
 const showNextButton = computed(
-  () => state.questionIndex + 1 < questions.value?.length && questions.value?.length > 1
+  () => questionIndex.value + 1 < questions.value?.length && questions.value?.length > 1
 );
 const showExitButton = computed(
   () =>
-    questions.value?.length === 1 || questions.value?.length === state.questionIndex + 1
+    questions.value?.length === 1 || questions.value?.length === questionIndex.value + 1
 );
 
 function handleContinue() {
   log.debug("handleContinue");
-  if (state.questionIndex + 1 < questions.value.length) {
-    log.debug("increment questionIndex", state.questionIndex);
-    state.questionIndex += 1;
+  if (questionIndex.value + 1 < questions.value.length) {
+    log.debug("increment questionIndex", questionIndex.value);
+    questionIndex.value += 1;
   } else {
     log.debug("continue to next learning content");
     circleStore.continueFromSelfEvaluation(props.learningUnit);
@@ -47,8 +46,8 @@ function handleContinue() {
 
 function handleBack() {
   log.debug("handleBack");
-  if (state.questionIndex > 0 && state.questionIndex < questions.value.length) {
-    state.questionIndex -= 1;
+  if (questionIndex.value > 0 && questionIndex.value < questions.value.length) {
+    questionIndex.value -= 1;
   }
 }
 
@@ -69,7 +68,7 @@ onUnmounted(() => {
       @exit="circleStore.closeSelfEvaluation(props.learningUnit)"
     >
       <LearningContentMultiLayout
-        :current-step="state.questionIndex"
+        :current-step="questionIndex"
         :subtitle="$t('selfEvaluation.title')"
         :title="$t('selfEvaluation.title', { title: learningUnit.title })"
         learning-content-type="learningmodule"
@@ -78,6 +77,7 @@ onUnmounted(() => {
         :show-exit-button="showExitButton"
         :show-start-button="false"
         :show-previous-button="showPreviousButton"
+        :base-url="props.learningUnit.evaluate_url"
         @previous="handleBack()"
         @next="handleContinue()"
       >
diff --git a/server/vbv_lernwelt/feedback/factories.py b/server/vbv_lernwelt/feedback/factories.py
index eb21d3c8..d55d830f 100644
--- a/server/vbv_lernwelt/feedback/factories.py
+++ b/server/vbv_lernwelt/feedback/factories.py
@@ -11,8 +11,7 @@ class FeedbackFactory(DjangoModelFactory):
             "satisfaction": FuzzyInteger(2, 4),
             "goal_attainment": FuzzyInteger(3, 4),
             "proficiency": FuzzyChoice([20, 40, 60, 80]),
-            "received_materials": FuzzyChoice([True, False]),
-            "materials_rating": FuzzyInteger(2, 4),
+            "preparation_task_clarity": FuzzyChoice([True, False]),
             "instructor_competence": FuzzyInteger(3, 4),
             "instructor_respect": FuzzyInteger(3, 4),
             "instructor_open_feedback": FuzzyChoice(
@@ -23,18 +22,18 @@ class FeedbackFactory(DjangoModelFactory):
                 ]
             ),
             "would_recommend": FuzzyChoice([True, False]),
-            "course_positive_feedback": FuzzyChoice(
-                [
-                    "Die Präsentation war super",
-                    "Das Beispiel mit der Katze fand ich sehr gut veranschaulicht!",
-                ]
-            ),
             "course_negative_feedback": FuzzyChoice(
                 [
                     "Es wäre praktisch, Zugang zu einer FAQ zu haben.",
                     "Es wäre schön, mehr Videos hinzuzufügen.",
                 ]
             ),
+            "course_positive_feedback": FuzzyChoice(
+                [
+                    "Die Präsentation war super",
+                    "Das Beispiel mit der Katze fand ich sehr gut veranschaulicht!",
+                ]
+            ),
         }
     )
 
diff --git a/server/vbv_lernwelt/feedback/models.py b/server/vbv_lernwelt/feedback/models.py
index 6b4f2a10..6901601e 100644
--- a/server/vbv_lernwelt/feedback/models.py
+++ b/server/vbv_lernwelt/feedback/models.py
@@ -53,18 +53,6 @@ class FeedbackResponse(models.Model):
                 )
         super(FeedbackResponse, self).save(*args, **kwargs)
 
-    # satisfaction = FeedbackIntegerField()
-    # goal_attainment = FeedbackIntegerField()
-    # proficiency = models.IntegerField(null=True)
-    # received_materials = models.BooleanField(null=True)
-    # materials_rating = FeedbackIntegerField()
-    # instructor_competence = FeedbackIntegerField()
-    # instructor_respect = FeedbackIntegerField()
-    # instructor_open_feedback = models.TextField(blank=True)
-    # would_recommend = models.BooleanField(null=True)
-    # course_positive_feedback = models.TextField(blank=True)
-    # course_negative_feedback = models.TextField(blank=True)
-
     data = models.JSONField(default=dict)
     created_at = models.DateTimeField(auto_now_add=True)
 
diff --git a/server/vbv_lernwelt/feedback/serializers.py b/server/vbv_lernwelt/feedback/serializers.py
index 17d149c4..3be42ed6 100644
--- a/server/vbv_lernwelt/feedback/serializers.py
+++ b/server/vbv_lernwelt/feedback/serializers.py
@@ -15,7 +15,7 @@ class CourseFeedbackSerializer(serializers.Serializer):
     satisfaction = FeedbackIntegerField()
     goal_attainment = FeedbackIntegerField()
     proficiency = serializers.IntegerField(required=False, allow_null=True)
-    received_materials = serializers.BooleanField(required=False, allow_null=True)
+    preparation_task_clarity = serializers.BooleanField()
     materials_rating = FeedbackIntegerField()
     instructor_competence = FeedbackIntegerField()
     instructor_respect = FeedbackIntegerField()
diff --git a/server/vbv_lernwelt/feedback/tests/test_feedback_api.py b/server/vbv_lernwelt/feedback/tests/test_feedback_api.py
index 51554f68..6ad2136c 100644
--- a/server/vbv_lernwelt/feedback/tests/test_feedback_api.py
+++ b/server/vbv_lernwelt/feedback/tests/test_feedback_api.py
@@ -190,8 +190,7 @@ class FeedbackDetailApiTestCase(FeedbackApiBaseTestCase):
             "satisfaction": [1, 4, 2],
             "goal_attainment": [2, 4, 3],
             "proficiency": [20, 60, 80],
-            "received_materials": [True, False, True],
-            "materials_rating": [3, 2, 1],
+            "preparation_task_clarity": [True, False, True],
             "instructor_competence": [1, 2, 3],
             "instructor_respect": [40, 80, 100],
             "instructor_open_feedback": ["super", "ok", "naja"],
@@ -214,14 +213,15 @@ class FeedbackDetailApiTestCase(FeedbackApiBaseTestCase):
                     "satisfaction": feedback_data["satisfaction"][i],
                     "goal_attainment": feedback_data["goal_attainment"][i],
                     "proficiency": feedback_data["proficiency"][i],
-                    "received_materials": feedback_data["received_materials"][i],
-                    "materials_rating": feedback_data["materials_rating"][i],
+                    "preparation_task_clarity": feedback_data[
+                        "preparation_task_clarity"
+                    ][i],
                     "instructor_competence": feedback_data["instructor_competence"][i],
                     "instructor_open_feedback": feedback_data[
                         "instructor_open_feedback"
                     ][i],
-                    "instructor_respect": feedback_data["instructor_respect"][i],
                     "would_recommend": feedback_data["would_recommend"][i],
+                    "instructor_respect": feedback_data["instructor_respect"][i],
                     "course_positive_feedback": feedback_data[
                         "course_positive_feedback"
                     ][i],
diff --git a/server/vbv_lernwelt/feedback/views.py b/server/vbv_lernwelt/feedback/views.py
index 150ae855..5871576f 100644
--- a/server/vbv_lernwelt/feedback/views.py
+++ b/server/vbv_lernwelt/feedback/views.py
@@ -12,14 +12,13 @@ FEEDBACK_FIELDS = [
     "satisfaction",
     "goal_attainment",
     "proficiency",
-    "received_materials",
-    "materials_rating",
     "instructor_competence",
     "instructor_respect",
     "instructor_open_feedback",
     "would_recommend",
     "course_positive_feedback",
     "course_negative_feedback",
+    "preparation_task_clarity",
 ]