diff --git a/client/src/components/learningPath/LearningContent.vue b/client/src/components/learningPath/LearningContent.vue
index aa1799bd..ea678518 100644
--- a/client/src/components/learningPath/LearningContent.vue
+++ b/client/src/components/learningPath/LearningContent.vue
@@ -64,7 +64,7 @@ const showNavigationBorder = computed(() => {
     @exit="circleStore.closeLearningContent(props.learningContent)"
     @next="circleStore.continueFromLearningContent(props.learningContent)"
   >
-    <div class="content">
+    <div>
       <component
         :is="component"
         :value="block.value"
diff --git a/client/src/components/learningPath/LearningContentContainer.vue b/client/src/components/learningPath/LearningContentContainer.vue
index aeecb74f..e770078d 100644
--- a/client/src/components/learningPath/LearningContentContainer.vue
+++ b/client/src/components/learningPath/LearningContentContainer.vue
@@ -29,11 +29,11 @@ defineEmits(["next", "exit"]);
     <div class="absolute top-0 bottom-0 w-full bg-white">
       <div class="h-content overflow-y-scroll">
         <header
-          class="absolute flex h-12 w-full items-center justify-between bg-white px-4 py-4 lg:px-8"
+          class="relative flex h-12 w-full items-center justify-between bg-white px-4 py-4 lg:h-16 lg:px-8"
         >
           <button
             type="button"
-            class="absolute right-4 top-4 h-8 w-8 cursor-pointer"
+            class="absolute right-2 top-2 h-8 w-8 cursor-pointer lg:right-4 lg:top-4"
             data-cy="close-learning-content"
             @click="$emit('exit')"
           >
@@ -50,7 +50,7 @@ defineEmits(["next", "exit"]);
           <LearningContentBadge
             v-if="learningContentBlock && learningContentBlock.type"
             :learning-content-type="learningContentBlock.type"
-            class="mr-2"
+            class="mr-2 hidden lg:flex"
           />
           <h1 class="hidden text-base font-normal lg:inline-block" data-cy="ln-title">
             {{ title }}
@@ -58,7 +58,7 @@ defineEmits(["next", "exit"]);
         </div>
         <button
           type="button"
-          class="btn-blue flex items-center"
+          class="btn-blue btn-large-icon"
           data-cy="complete-and-continue"
           @click="$emit('next')"
         >
diff --git a/client/src/components/learningPath/LearningContentNavigation.vue b/client/src/components/learningPath/LearningContentNavigation.vue
index 8374866f..9d485709 100644
--- a/client/src/components/learningPath/LearningContentNavigation.vue
+++ b/client/src/components/learningPath/LearningContentNavigation.vue
@@ -18,7 +18,7 @@ defineEmits(["back", "continue"]);
 
 <template>
   <div>
-    <nav class="mt-16 flex lg:justify-between">
+    <nav class="mt-16 mb-4 flex">
       <button
         v-if="showBackButton"
         class="btn-secondary mr-2 flex items-center"
diff --git a/client/src/components/learningPath/SelfEvaluation.vue b/client/src/components/learningPath/SelfEvaluation.vue
index ffa346bf..e5f0c00e 100644
--- a/client/src/components/learningPath/SelfEvaluation.vue
+++ b/client/src/components/learningPath/SelfEvaluation.vue
@@ -101,6 +101,9 @@ function handleBack() {
           </div>
         </div>
         <LearningContentNavigation
+          :show-next-button="
+            questions.length > 1 && state.questionIndex + 1 < questions.length
+          "
           :show-back-button="showBackButton"
           :question-index="state.questionIndex"
           :max-question-index="questions.length"
diff --git a/client/src/components/learningPath/blocks/DescriptionBlock.vue b/client/src/components/learningPath/blocks/DescriptionBlock.vue
index 168371d7..46a037bc 100644
--- a/client/src/components/learningPath/blocks/DescriptionBlock.vue
+++ b/client/src/components/learningPath/blocks/DescriptionBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-medium">
-    <div class="mt-4 lg:mt-12">
+    <div class="lg:mt-8">
       <p class="text-large my-4">{{ value.description }}</p>
     </div>
   </div>
diff --git a/client/src/components/learningPath/blocks/DescriptionTextBlock.vue b/client/src/components/learningPath/blocks/DescriptionTextBlock.vue
index 58fcdf58..1606829a 100644
--- a/client/src/components/learningPath/blocks/DescriptionTextBlock.vue
+++ b/client/src/components/learningPath/blocks/DescriptionTextBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-medium">
-    <div class="mt-4 lg:mt-12">
+    <div class="lg:mt-8">
       <p class="text-large my-4">{{ value.description }}</p>
       <div class="resource-text" v-html="value.text"></div>
     </div>
diff --git a/client/src/components/learningPath/blocks/FeedbackBlock.vue b/client/src/components/learningPath/blocks/FeedbackBlock.vue
index 8bd0c943..9716f7e1 100644
--- a/client/src/components/learningPath/blocks/FeedbackBlock.vue
+++ b/client/src/components/learningPath/blocks/FeedbackBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-medium">
-    <div class="mt-4 lg:mt-12">
+    <div class="lg:mt-12">
       <FeedbackForm :page="content" />
     </div>
   </div>
diff --git a/client/src/components/learningPath/blocks/MediaLibraryBlock.vue b/client/src/components/learningPath/blocks/MediaLibraryBlock.vue
index 2cbb2d43..d48fde39 100644
--- a/client/src/components/learningPath/blocks/MediaLibraryBlock.vue
+++ b/client/src/components/learningPath/blocks/MediaLibraryBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-medium">
-    <div class="mt-4 lg:mt-12">
+    <div class="lg:mt-8">
       <h1>{{ content.title }}</h1>
 
       <p class="text-large my-4 lg:my-8">{{ value.description }}</p>
diff --git a/client/src/components/learningPath/blocks/PlaceholderBlock.vue b/client/src/components/learningPath/blocks/PlaceholderBlock.vue
index 0d9bac91..e7cd276d 100644
--- a/client/src/components/learningPath/blocks/PlaceholderBlock.vue
+++ b/client/src/components/learningPath/blocks/PlaceholderBlock.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container-medium">
-    <div class="mt-4 lg:mt-12">
+    <div class="lg:mt-8">
       <p class="text-large my-4">{{ value.description }}</p>
       <h1>{{ content.title }}</h1>
     </div>
diff --git a/client/src/stores/circle.ts b/client/src/stores/circle.ts
index 009ce2d5..4bdf2522 100644
--- a/client/src/stores/circle.ts
+++ b/client/src/stores/circle.ts
@@ -162,32 +162,7 @@ export const useCircleStore = defineStore({
     continueFromLearningContent(currentLearningContent: LearningContent) {
       if (currentLearningContent) {
         this.markCompletion(currentLearningContent, "success");
-
-        const nextLearningContent = currentLearningContent.nextLearningContent;
-        const currentParent = currentLearningContent.parentLearningUnit;
-        const nextParent = nextLearningContent?.parentLearningUnit;
-
-        if (
-          currentParent &&
-          currentParent.id &&
-          currentParent.id !== nextParent?.id &&
-          currentParent.children.length > 0
-        ) {
-          // go to self evaluation
-          this.openSelfEvaluation(currentParent);
-        } else if (currentLearningContent.nextLearningContent) {
-          if (
-            currentLearningContent.parentLearningUnit &&
-            currentLearningContent.parentLearningUnit.id ===
-              nextLearningContent?.parentLearningUnit?.id
-          ) {
-            this.openLearningContent(currentLearningContent.nextLearningContent);
-          } else {
-            this.closeLearningContent(currentLearningContent);
-          }
-        } else {
-          this.closeLearningContent(currentLearningContent);
-        }
+        this.closeLearningContent(currentLearningContent);
       } else {
         log.error("currentLearningContent is undefined");
       }
diff --git a/client/tailwind.css b/client/tailwind.css
index 8a3996fe..4d5a61c1 100644
--- a/client/tailwind.css
+++ b/client/tailwind.css
@@ -122,6 +122,10 @@ svg {
     hover:text-gray-700
     disabled:cursor-not-allowed disabled:opacity-50;
   }
+
+  .btn-large-icon {
+    @apply flex items-center px-6 py-3  text-xl font-bold;
+  }
 }
 
 @layer utilities {
diff --git a/server/vbv_lernwelt/feedback/factories.py b/server/vbv_lernwelt/feedback/factories.py
index 96edff5d..73dd1285 100644
--- a/server/vbv_lernwelt/feedback/factories.py
+++ b/server/vbv_lernwelt/feedback/factories.py
@@ -8,13 +8,13 @@ class FeedbackFactory(DjangoModelFactory):
     class Meta:
         model = FeedbackResponse
 
-    satisfaction = FuzzyInteger(1, 4)
-    goal_attainment = FuzzyInteger(1, 4)
+    satisfaction = FuzzyInteger(2, 4)
+    goal_attainment = FuzzyInteger(3, 4)
     proficiency = FuzzyChoice([20, 40, 60, 80])
     received_materials = FuzzyChoice([True, False])
-    materials_rating = FuzzyInteger(1, 4)
-    instructor_competence = FuzzyInteger(1, 4)
-    instructor_respect = FuzzyInteger(1, 4)
+    materials_rating = FuzzyInteger(2, 4)
+    instructor_competence = FuzzyInteger(3, 4)
+    instructor_respect = FuzzyInteger(3, 4)
     instructor_open_feedback = FuzzyChoice(
         [
             "Alles gut, manchmal etwas langfädig",