diff --git a/assets/exam-simulator.css b/assets/exam-simulator.css
index 18336b9..f5bb6fc 100644
--- a/assets/exam-simulator.css
+++ b/assets/exam-simulator.css
@@ -95,12 +95,12 @@
 .answer-table td.answer-cell-solution,
 .answer-table td.answer-cell-correct .answer-mark,
 .answer-table td.answer-cell-solution .answer-mark {
-  background-color: #3bb583;
+  background-color: #3bb583 !important;
 }
 
 .answer-table td.answer-cell-wrong,
 .answer-table td.answer-cell-wrong .answer-mark {
-  background-color: #fe756c;
+  background-color: #fe756c !important;
 }
 
 .exam-question {
diff --git a/assets/exam-simulator.js b/assets/exam-simulator.js
index 7b46553..cfa677d 100644
--- a/assets/exam-simulator.js
+++ b/assets/exam-simulator.js
@@ -344,7 +344,7 @@
       }
 
       function answerCellClass(questionIndex, answerIndex) {
-        if (currentPart.value.status !== "evaluated") return "";
+        if (currentPart.value.status === "running") return "";
         var question = currentPart.value.questions[questionIndex];
         var sourceIndex = question.order[answerIndex];
         if (question.selected === answerIndex && sourceIndex === 0) return "answer-cell-correct";
diff --git a/templates/html/exam-simulator.html b/templates/html/exam-simulator.html
index c285f9b..f6de9c9 100644
--- a/templates/html/exam-simulator.html
+++ b/templates/html/exam-simulator.html
@@ -127,7 +127,8 @@
       </div>
     </div>
 
-    <div class="exam-paper-layout" :key="'exam-part-' + displayedPartIndex + '-' + currentPart.code">
+    <div class="exam-paper-layout"
+         :key="'exam-part-' + displayedPartIndex + '-' + currentPart.code + '-' + currentPart.status">
       <main class="exam-questions course">
         <template v-for="(questionState, questionIndex) in currentPart.questions" :key="questionState.id">
           <article class="question exam-question" :class="'layout-' + questionData(questionState).layout"