diff --git a/client/src/components/assignment/evaluation/EvaluationContainer.vue b/client/src/components/assignment/evaluation/EvaluationContainer.vue
index 7cd18bf6..e4849394 100644
--- a/client/src/components/assignment/evaluation/EvaluationContainer.vue
+++ b/client/src/components/assignment/evaluation/EvaluationContainer.vue
@@ -118,22 +118,6 @@ const taskExpertDataText = computed(() => {
   return result;
 });
 
-const text = computed(() => {
-  if (props.assignment.assignment_type === "CASEWORK") {
-    return {
-      evaluationFinish: "a.Schliessen",
-    };
-  } else if (props.assignment.assignment_type === "PRAXIS_ASSIGNMENT") {
-    return {
-      evaluationFinish: "a.Schliessen",
-    };
-  } else {
-    return {
-      evaluationFinish: "UNKNOWN ASSIGNMENT TYPE",
-    };
-  }
-});
-
 function nextButtonEnabled() {
   if (inEvaluationTask.value) {
     return taskExpertDataText.value ?? false;
@@ -142,13 +126,12 @@ function nextButtonEnabled() {
 }
 
 function previousButtonVisible() {
-  if (
+  // Bei einer "bewerteten" Arbeit, kann man im letzten Schritt nicht mehr "zurück"
+  // man kann aber die Bewertung wieder "bearbeiten"
+  return !(
     stepIndex.value > numTasks.value &&
     props.assignmentCompletion.completion_status === "EVALUATION_SUBMITTED"
-  ) {
-    return false;
-  }
-  return true;
+  );
 }
 
 function finishButtonEnabled() {
@@ -231,7 +214,7 @@ function finishButtonEnabled() {
           @click="emit('close')"
         >
           <span class="flex items-center">
-            {{ $t(text.evaluationFinish) }}
+            {{ $t("a.Schliessen") }}
           </span>
         </button>
       </div>
diff --git a/client/src/components/assignment/evaluation/EvaluationIntro.vue b/client/src/components/assignment/evaluation/EvaluationIntro.vue
index 0fdedd9e..12735aab 100644
--- a/client/src/components/assignment/evaluation/EvaluationIntro.vue
+++ b/client/src/components/assignment/evaluation/EvaluationIntro.vue
@@ -132,8 +132,8 @@ async function startEvaluation() {
       </button>
     </div>
 
-    <section class="mt-8">
-      <div
+    <ol class="mt-8">
+      <li
         v-for="historyEntry in props.assignmentCompletion.additional_json_data
           ?.submission_history ?? []"
         :key="historyEntry.timestamp"
@@ -141,8 +141,8 @@ async function startEvaluation() {
         {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
         {{ $t(historyEntry.translation_key) }}
         ({{ historyEntry.user_display_name }})
-      </div>
-    </section>
+      </li>
+    </ol>
   </div>
 </template>
 
diff --git a/client/src/components/assignment/evaluation/EvaluationSummary.vue b/client/src/components/assignment/evaluation/EvaluationSummary.vue
index 1488780a..c8a1e0b8 100644
--- a/client/src/components/assignment/evaluation/EvaluationSummary.vue
+++ b/client/src/components/assignment/evaluation/EvaluationSummary.vue
@@ -302,16 +302,17 @@ const showPassed = computed(() => {
       </div>
 
       <section class="mt-4" data-cy="assignment-history">
-        <div
-          v-for="historyEntry in props.assignmentCompletion.additional_json_data
-            ?.submission_history ?? []"
-          :key="historyEntry.timestamp"
-          data-cy="assignment-history-entry"
-        >
-          {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
-          {{ $t(historyEntry.translation_key) }}
-          ({{ historyEntry.user_display_name }})
-        </div>
+        <ol>
+          <li
+            v-for="historyEntry in props.assignmentCompletion.additional_json_data
+              ?.submission_history ?? []"
+            :key="historyEntry.timestamp"
+          >
+            {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
+            {{ $t(historyEntry.translation_key) }}
+            ({{ historyEntry.user_display_name }})
+          </li>
+        </ol>
       </section>
     </section>