diff --git a/src/exams/Level/index.tsx b/src/exams/Level/index.tsx
index 94b2d4be..8eb61d4d 100644
--- a/src/exams/Level/index.tsx
+++ b/src/exams/Level/index.tsx
@@ -70,7 +70,8 @@ export default function Level({ exam, showSolutions = false, onFinish, editing =
             userSolutions: userSolutions.find((x) => x.exercise === exercise.id)?.solutions || [],
         };
 
-        if (exam.shuffle && exercise.type === "multipleChoice") {
+        if (exam.shuffle && exercise.type === "multipleChoice" && !showSolutions) {
+            console.log("Shuffling");
             const exerciseShuffles = userSolutions[exerciseIndex].shuffleMaps;
             if (exerciseShuffles && exerciseShuffles.length == 0) {
                 const newShuffleMaps: ShuffleMap[] = [];
@@ -112,7 +113,7 @@ export default function Level({ exam, showSolutions = false, onFinish, editing =
                     return question;
                 });
             }
-        } else if (exam.shuffle && exercise.type === "fillBlanks" && typeCheckWordsMC(exercise.words)) {
+        } else if (exam.shuffle && exercise.type === "fillBlanks" && typeCheckWordsMC(exercise.words) && !showSolutions) {
             if (shuffleMaps.length === 0 && !showSolutions) {
                 const newShuffleMaps: ShuffleMap[] = [];
 
@@ -194,7 +195,7 @@ export default function Level({ exam, showSolutions = false, onFinish, editing =
         }
 
         if (partIndex + 1 < exam.parts.length && !hasExamEnded && (showQuestionsModal || showSolutions)) {
-            if (!showSolutions) {
+            if (!showSolutions && exam.parts[0].intro) {
                 setShowPartDivider(true);
                 setBgColor(levelBgColor);
             }
@@ -353,7 +354,7 @@ export default function Level({ exam, showSolutions = false, onFinish, editing =
                     !(partIndex === 0 && storeQuestionIndex === 0 && showPartDivider) &&
                     <Timer minTimer={exam.minTimer} disableTimer={showSolutions} standalone={true} />
                 }
-                {showPartDivider ? <PartDivider part={exam.parts[partIndex]} partIndex={partIndex} onNext={() => { setShowPartDivider(false); setBgColor("bg-white") }} /> : (
+                {exam.parts[0].intro && showPartDivider ? <PartDivider part={exam.parts[partIndex]} partIndex={partIndex} onNext={() => { setShowPartDivider(false); setBgColor("bg-white") }} /> : (
                     <>
                         <ModuleTitle
                             partLabel={partLabel()}