ENCOA-137: Top right side Next Button on the exams

src/components/Exercises/FillBlanks/index.tsx

@@ -7,7 +7,6 @@ import { CommonProps } from "..";
 import Button from "../../Low/Button";
 import {v4} from "uuid";
 
-
 const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 	id,
 	type,
@@ -26,24 +25,21 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 	const setCurrentSolution = useExamStore((state) => state.setCurrentSolution);
 	const shuffleMaps = shuffles.find((x) => x.exerciseID == id)?.shuffles;
 
-    const [currentMCSelection, setCurrentMCSelection] = useState<{ id: string, selection: FillBlanksMCOption }>();
+	const [currentMCSelection, setCurrentMCSelection] = useState<{id: string; selection: FillBlanksMCOption}>();
 
 	const typeCheckWordsMC = (words: any[]): words is FillBlanksMCOption[] => {
-        return Array.isArray(words) && words.every(
+		return Array.isArray(words) && words.every((word) => word && typeof word === "object" && "id" in word && "options" in word);
-            word => word && typeof word === 'object' && 'id' in word && 'options' in word
+	};
-        );
-    }
 
 	const excludeWordMCType = (x: any) => {
-        return typeof x === "string" ? x : x as { letter: string; word: string };
+		return typeof x === "string" ? x : (x as {letter: string; word: string});
-    }
+	};
 
 	useEffect(() => {
 		if (hasExamEnded) onNext({exercise: id, solutions: answers, score: calculateScore(), type});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [hasExamEnded]);
 
-
 	let correctWords: any;
 	if (exam && (exam.module === "level" || exam.module === "reading") && exam.parts[partIndex].exercises[exerciseIndex].type === "fillBlanks") {
 		correctWords = (exam.parts[partIndex].exercises[exerciseIndex] as FillBlanksExercise).words;
@@ -57,7 +53,7 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 			const option = correctWords!.find((w: any) => {
 				if (typeof w === "string") {
 					return w.toLowerCase() === x.solution.toLowerCase();
-                } else if ('letter' in w) {
+				} else if ("letter" in w) {
 					return w.letter.toLowerCase() === x.solution.toLowerCase();
 				} else {
 					return w.id.toString() === x.id.toString();
@@ -67,9 +63,9 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 
 			if (typeof option === "string") {
 				return solution.toLowerCase() === option.toLowerCase();
-            } else if ('letter' in option) {
+			} else if ("letter" in option) {
 				return solution.toLowerCase() === option.word.toLowerCase();
-            } else if ('options' in option) {
+			} else if ("options" in option) {
 				return option.options[solution as keyof typeof option.options] == x.solution;
 			}
 			return false;
@@ -77,7 +73,8 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 		const missing = total - answers!.filter((x) => solutions.find((y) => x.id.toString() === y.id.toString())).length;
 		return {total, correct, missing};
 	};
-    const renderLines = useCallback((line: string) => {
+	const renderLines = useCallback(
+		(line: string) => {
 			return (
 				<div className="text-base leading-5" key={v4()}>
 					{reactStringReplace(line, /({{\d+}})/g, (match) => {
@@ -88,41 +85,43 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 							currentMCSelection?.id == id && "!bg-mti-purple !text-white !outline-none !ring-0",
 							!userSolution && "text-center text-mti-purple-light bg-mti-purple-ultralight",
 							userSolution && "text-center text-mti-purple-dark bg-mti-purple-ultralight",
-                    )
+						);
-                    return (
+						return variant === "mc" ? (
-                        variant === "mc" ? (
 							<>
 								{/*<span className="mr-2">{`(${id})`}</span>*/}
 								<button
 									className={styles}
 									onClick={() => {
-                                        setCurrentMCSelection(
+										setCurrentMCSelection({
-                                            {
 											id: id,
 											selection: words.find((x) => {
-                                                    if (typeof x !== "string" && 'id' in x) {
+												if (typeof x !== "string" && "id" in x) {
 													return (x as FillBlanksMCOption).id.toString() == id.toString();
 												}
 												return false;
-                                                }) as FillBlanksMCOption
+											}) as FillBlanksMCOption,
-                                            }
+										});
-                                        );
+									}}>
-                                    }}
+									{userSolution?.solution === undefined ? (
-                                >
+										<span className="text-transparent select-none">placeholder</span>
-                                    {userSolution?.solution === undefined ? <span className="text-transparent select-none">placeholder</span> : <span> {userSolution.solution} </span>}
+									) : (
+										<span> {userSolution.solution} </span>
+									)}
 								</button>
 							</>
 						) : (
 							<input
 								className={styles}
 								onChange={(e) => setAnswers((prev) => [...prev.filter((x) => x.id !== id), {id, solution: e.target.value}])}
-                                value={userSolution?.solution} />
+								value={userSolution?.solution}
-                        )
+							/>
 						);
 					})}
 				</div>
 			);
-    }, [variant, words, setCurrentMCSelection, answers, currentMCSelection]);
+		},
+		[variant, words, setCurrentMCSelection, answers, currentMCSelection],
+	);
 
 	const memoizedLines = useMemo(() => {
 		return text.split("\\n").map((line, index) => (
@@ -134,50 +133,77 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [text, variant, renderLines, currentMCSelection]);
 
-
 	const onSelection = (questionID: string, value: string) => {
 		setAnswers((prev) => [...prev.filter((x) => x.id !== questionID), {id: questionID, solution: value}]);
-    }
+	};
 
 	useEffect(() => {
 		if (variant === "mc") {
 			setCurrentSolution({exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps});
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [answers])
+	}, [answers]);
 
 	return (
-        <>
+		<div className="flex flex-col gap-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps})}
+					className="max-w-[200px] w-full"
+					disabled={exam && exam.module === "level" && partIndex === 0 && questionIndex === 0}>
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => {
+						onNext({exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps});
+					}}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
-                {variant !== "mc" && <span className="text-sm w-full leading-6">
+				{variant !== "mc" && (
+					<span className="text-sm w-full leading-6">
 						{prompt.split("\\n").map((line, index) => (
 							<Fragment key={index}>
 								{line}
 								<br />
 							</Fragment>
 						))}
-                </span>}
-                <span className="bg-mti-gray-smoke rounded-xl px-5 py-6">
-                    {memoizedLines}
 					</span>
+				)}
+				<span className="bg-mti-gray-smoke rounded-xl px-5 py-6">{memoizedLines}</span>
 				{variant === "mc" && typeCheckWordsMC(words) ? (
 					<>
 						{currentMCSelection && (
 							<div className="bg-mti-gray-smoke rounded-xl flex flex-col gap-4 px-16 py-8">
 								<span className="font-medium text-lg text-mti-purple-dark mb-4 px-2">{`${currentMCSelection.id} - Select the appropriate word.`}</span>
 								<div className="flex gap-4 flex-wrap justify-between">
-                                    {currentMCSelection.selection?.options && Object.entries(currentMCSelection.selection.options).sort((a, b) => a[0].localeCompare(b[0])).map(([key, value]) => {
+									{currentMCSelection.selection?.options &&
-                                        return <div
+										Object.entries(currentMCSelection.selection.options)
+											.sort((a, b) => a[0].localeCompare(b[0]))
+											.map(([key, value]) => {
+												return (
+													<div
 														key={v4()}
 														onClick={() => onSelection(currentMCSelection.id, value)}
 														className={clsx(
 															"flex border p-4 rounded-xl gap-2 cursor-pointer bg-white text-base",
-                                                !!answers.find((x) => x.solution.toLocaleLowerCase() === value.toLocaleLowerCase() && x.id === currentMCSelection.id) &&
+															!!answers.find(
-                                                "!bg-mti-purple-light !text-white",
+																(x) =>
+																	x.solution.toLocaleLowerCase() === value.toLocaleLowerCase() &&
+																	x.id === currentMCSelection.id,
+															) && "!bg-mti-purple-light !text-white",
 														)}>
 														<span className="font-semibold">{key}.</span>
 														<span>{value}</span>
 													</div>
+												);
 											})}
 								</div>
 							</div>
@@ -195,14 +221,16 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 									<span
 										className={clsx(
 											"border border-mti-purple-light rounded-full px-3 py-0.5 transition ease-in-out duration-300",
-                                            !!answers.find((x) => x.solution.toLowerCase() === (typeof v === "string" ? v : ("letter" in v ? v.letter : "")).toLowerCase()) &&
+											!!answers.find(
-                                            "bg-mti-purple-dark text-white",
+												(x) =>
+													x.solution.toLowerCase() ===
+													(typeof v === "string" ? v : "letter" in v ? v.letter : "").toLowerCase(),
+											) && "bg-mti-purple-dark text-white",
 										)}
-                                        key={v4()}
+										key={v4()}>
-                                    >
 										{text}
 									</span>
-                                )
+								);
 							})}
 						</div>
 					</div>
@@ -214,24 +242,21 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
 					variant="outline"
 					onClick={() => onBack({exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps})}
 					className="max-w-[200px] w-full"
-                    disabled={
+					disabled={exam && exam.module === "level" && partIndex === 0 && questionIndex === 0}>
-                        exam && exam.module === "level" &&
-                        partIndex === 0 &&
-                        questionIndex === 0
-                    }
-                >
 					Back
 				</Button>
 
 				<Button
 					color="purple"
-                    onClick={() => { onNext({ exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps }) }}
+					onClick={() => {
+						onNext({exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps});
+					}}
 					className="max-w-[200px] self-end w-full">
 					Next
 				</Button>
 			</div>
-        </>
+		</div>
 	);
-}
+};
 
 export default FillBlanks;

src/components/Exercises/InteractiveSpeaking.tsx

@@ -152,6 +152,16 @@ export default function InteractiveSpeaking({
 	};
 
 	return (
+		<div className="flex flex-col gap-4 mt-4 w-full">
+			<div className="flex justify-between w-full gap-8">
+				<Button color="purple" variant="outline" isLoading={isLoading} onClick={back} className="max-w-[200px] self-end w-full">
+					Back
+				</Button>
+				<Button color="purple" disabled={!mediaBlob} isLoading={isLoading} onClick={next} className="max-w-[200px] self-end w-full">
+					{questionIndex + 1 < prompts.length ? "Next Prompt" : "Submit"}
+				</Button>
+			</div>
+
 			<div className="flex flex-col h-full w-full gap-9">
 				<div className="flex flex-col w-full gap-8 bg-mti-gray-smoke rounded-xl py-8 pb-12 px-16">
 					<div className="flex flex-col gap-3">
@@ -293,5 +303,6 @@ export default function InteractiveSpeaking({
 					</Button>
 				</div>
 			</div>
+		</div>
 	);
 }

src/components/Exercises/MatchSentences.tsx

@@ -73,7 +73,7 @@ export default function MatchSentences({id, options, type, prompt, sentences, us
 	useEffect(() => {
 		setCurrentSolution({exercise: id, solutions: answers, score: calculateScore(), type});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [answers, setAnswers])
+	}, [answers, setAnswers]);
 
 	const handleDragEnd = (event: DragEndEvent) => {
 		if (event.over && event.over.id.toString().startsWith("droppable")) {
@@ -100,7 +100,24 @@ export default function MatchSentences({id, options, type, prompt, sentences, us
 	}, [hasExamEnded]);
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: answers, score: calculateScore(), type})}
+					className="max-w-[200px] w-full">
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: answers, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
@@ -150,6 +167,6 @@ export default function MatchSentences({id, options, type, prompt, sentences, us
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Exercises/MultipleChoice.tsx

@@ -151,8 +151,29 @@ export default function MultipleChoice({id, prompt, type, questions, userSolutio
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4">
-			<div className="flex flex-col gap-4 mt-2 mb-20">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={back}
+					className="max-w-[200px] w-full"
+					disabled={exam && exam.module === "level" && partIndex === 0 && questionIndex === 0}>
+					Back
+				</Button>
+
+				<Button color="purple" onClick={next} className="max-w-[200px] self-end w-full">
+					{exam &&
+					exam.module === "level" &&
+					partIndex === exam.parts.length - 1 &&
+					exerciseIndex === exam.parts[partIndex].exercises.length - 1 &&
+					questionIndex + 1 >= questions.length - 1
+						? "Submit"
+						: "Next"}
+				</Button>
+			</div>
+
+			<div className="flex flex-col gap-4 mt-4 mb-20">
 				<div className="flex flex-col gap-8 h-fit w-full bg-mti-gray-smoke rounded-xl px-16 py-8">
 					{/*<span className="text-xl font-semibold mb-2">{"Select the appropriate option."}</span>*/}
 					{questionIndex < questions.length && (
@@ -195,6 +216,6 @@ export default function MultipleChoice({id, prompt, type, questions, userSolutio
 						: "Next"}
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Exercises/Speaking.tsx

@@ -116,6 +116,16 @@ export default function Speaking({ id, title, text, video_url, type, prompts, su
 	};
 
 	return (
+		<div className="flex flex-col gap-4 mt-4 w-full">
+			<div className="flex justify-between w-full gap-8">
+				<Button color="purple" variant="outline" isLoading={isLoading} onClick={back} className="max-w-[200px] self-end w-full">
+					Back
+				</Button>
+				<Button color="purple" isLoading={isLoading} disabled={!mediaBlob} onClick={next} className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col h-full w-full gap-9">
 				<Modal title="Prompts" className="!w-96 aspect-square" isOpen={isPromptsModalOpen} onClose={() => setIsPromptsModalOpen(false)}>
 					<div className="flex flex-col items-center justify-center gap-4 w-full h-full">
@@ -134,7 +144,9 @@ export default function Speaking({ id, title, text, video_url, type, prompts, su
 						<div className="flex flex-col gap-0">
 							<span className="font-semibold">{title}</span>
 							{prompts.length > 0 && (
-							<span className="font-semibold">You should talk for at least 1 minute and 30 seconds for your answer to be valid.</span>
+								<span className="font-semibold">
+									You should talk for at least 1 minute and 30 seconds for your answer to be valid.
+								</span>
 							)}
 						</div>
 						{!video_url && (
@@ -300,5 +312,6 @@ export default function Speaking({ id, title, text, video_url, type, prompts, su
 					</Button>
 				</div>
 			</div>
+		</div>
 	);
 }

src/components/Exercises/TrueFalse.tsx

@@ -32,8 +32,7 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o
 	useEffect(() => {
 		setCurrentSolution({exercise: id, solutions: answers, score: calculateScore(), type});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [answers, setAnswers])
+	}, [answers, setAnswers]);
-
 
 	const toggleAnswer = (solution: "true" | "false" | "not_given", questionId: string) => {
 		const answer = answers.find((x) => x.id === questionId);
@@ -46,7 +45,24 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: answers, score: calculateScore(), type})}
+					className="max-w-[200px] w-full">
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: answers, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
@@ -123,6 +139,6 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Exercises/WriteBlanks.tsx

@@ -73,7 +73,7 @@ export default function WriteBlanks({id, prompt, type, maxWords, solutions, user
 	useEffect(() => {
 		setCurrentSolution({exercise: id, solutions: answers, score: calculateScore(), type});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [answers, setAnswers])
+	}, [answers, setAnswers]);
 
 	const renderLines = (line: string) => {
 		return (
@@ -92,7 +92,24 @@ export default function WriteBlanks({id, prompt, type, maxWords, solutions, user
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: answers, score: calculateScore(), type})}
+					className="max-w-[200px] w-full">
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: answers, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
@@ -128,6 +145,6 @@ export default function WriteBlanks({id, prompt, type, maxWords, solutions, user
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Exercises/Writing.tsx

@@ -84,7 +84,34 @@ export default function Writing({
 	}, [inputText, wordCounter]);
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() =>
+						onBack({exercise: id, solutions: [{id, solution: inputText}], score: {correct: 100, total: 100, missing: 0}, type})
+					}
+					className="max-w-[200px] self-end w-full">
+					Back
+				</Button>
+				<Button
+					color="purple"
+					disabled={!isSubmitEnabled}
+					onClick={() =>
+						onNext({
+							exercise: id,
+							solutions: [{id, solution: inputText.replaceAll(/\s{2,}/g, " ")}],
+							score: {correct: 100, total: 100, missing: 0},
+							type,
+							module: "writing",
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			{attachment && (
 				<Transition show={isModalOpen} as={Fragment}>
 					<Dialog onClose={() => setIsModalOpen(false)} className="relative z-50">
@@ -170,6 +197,6 @@ export default function Writing({
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/FillBlanks.tsx

@@ -6,22 +6,11 @@ import { Fragment } from "react";
 import Button from "../Low/Button";
 import useExamStore from "@/stores/examStore";
 
-export default function FillBlanksSolutions({
+export default function FillBlanksSolutions({id, type, prompt, solutions, words, text, onNext, onBack}: FillBlanksExercise & CommonProps) {
-	id,
-	type,
-	prompt,
-	solutions,
-	words,
-	text,
-	onNext,
-	onBack,
-}: FillBlanksExercise & CommonProps) {
 	const storeUserSolutions = useExamStore((state) => state.userSolutions);
 	const {questionIndex, setQuestionIndex, partIndex, exam} = useExamStore((state) => state);
 
-	const correctUserSolutions = storeUserSolutions.find(
+	const correctUserSolutions = storeUserSolutions.find((solution) => solution.exercise === id)?.solutions;
-		(solution) => solution.exercise === id
-	)?.solutions;
 
 	const shuffles = useExamStore((state) => state.shuffles);
 
@@ -34,7 +23,7 @@ export default function FillBlanksSolutions({
 			const option = words.find((w) => {
 				if (typeof w === "string") {
 					return w.toLowerCase() === x.solution.toLowerCase();
-				} else if ('letter' in w) {
+				} else if ("letter" in w) {
 					return w.letter.toLowerCase() === x.solution.toLowerCase();
 				} else {
 					return w.id.toString() === x.id.toString();
@@ -44,9 +33,9 @@ export default function FillBlanksSolutions({
 
 			if (typeof option === "string") {
 				return solution.toLowerCase() === option.toLowerCase();
-			} else if ('letter' in option) {
+			} else if ("letter" in option) {
 				return solution.toLowerCase() === option.word.toLowerCase();
-			} else if ('options' in option) {
+			} else if ("options" in option) {
 				return option.options[solution as keyof typeof option.options] == x.solution;
 			}
 			return false;
@@ -55,12 +44,9 @@ export default function FillBlanksSolutions({
 		return {total, correct, missing};
 	};
 
-
 	const typeCheckWordsMC = (words: any[]): words is FillBlanksMCOption[] => {
-		return Array.isArray(words) && words.every(
+		return Array.isArray(words) && words.every((word) => word && typeof word === "object" && "id" in word && "options" in word);
-			word => word && typeof word === 'object' && 'id' in word && 'options' in word
+	};
-		);
-	}
 
 	const renderLines = (line: string) => {
 		return (
@@ -68,17 +54,17 @@ export default function FillBlanksSolutions({
 				{reactStringReplace(line, /({{\d+}})/g, (match) => {
 					const questionId = match.replaceAll(/[\{\}]/g, "");
 					const userSolution = correctUserSolutions!.find((x) => x.id.toString() === questionId.toString());
-					const answerSolution = solutions.find(sol => sol.id.toString() === questionId.toString())!.solution;
+					const answerSolution = solutions.find((sol) => sol.id.toString() === questionId.toString())!.solution;
 					const questionShuffleMap = shuffles.find((x) => x.exerciseID == id)?.shuffles.find((y) => y.questionID == questionId);
-					const newAnswerSolution = questionShuffleMap ? questionShuffleMap.map[answerSolution].toLowerCase() : answerSolution.toLowerCase();
+					const newAnswerSolution = questionShuffleMap
+						? questionShuffleMap.map[answerSolution].toLowerCase()
+						: answerSolution.toLowerCase();
 
 					if (!userSolution) {
 						let answerText;
 						if (typeCheckWordsMC(words)) {
 							const options = words.find((x) => x.id.toString() === questionId.toString());
-							const correctKey = Object.keys(options!.options).find(key =>
+							const correctKey = Object.keys(options!.options).find((key) => key.toLowerCase() === newAnswerSolution);
-								key.toLowerCase() === newAnswerSolution
-							);
 							answerText = options!.options[correctKey as keyof typeof options];
 						} else {
 							answerText = answerSolution;
@@ -97,19 +83,19 @@ export default function FillBlanksSolutions({
 					const userSolutionWord = words.find((w) =>
 						typeof w === "string"
 							? w.toLowerCase() === userSolution.solution.toLowerCase()
-							: 'letter' in w
+							: "letter" in w
 							? w.letter.toLowerCase() === userSolution.solution.toLowerCase()
-								: 'options' in w
+							: "options" in w
 							? w.id === userSolution.questionId
-									: false
+							: false,
 					);
 
 					const userSolutionText =
 						typeof userSolutionWord === "string"
 							? userSolutionWord
-							: userSolutionWord && 'letter' in userSolutionWord
+							: userSolutionWord && "letter" in userSolutionWord
 							? userSolutionWord.word
-								: userSolutionWord && 'options' in userSolutionWord
+							: userSolutionWord && "options" in userSolutionWord
 							? userSolution.solution
 							: userSolution.solution;
 
@@ -118,16 +104,13 @@ export default function FillBlanksSolutions({
 					if (typeCheckWordsMC(words)) {
 						const options = words.find((x) => x.id.toString() === questionId.toString());
 						if (options) {
-							const correctKey = Object.keys(options.options).find(key =>
+							const correctKey = Object.keys(options.options).find((key) => key.toLowerCase() === newAnswerSolution);
-								key.toLowerCase() === newAnswerSolution
-							);
 							correct = userSolution.solution == options.options[correctKey as keyof typeof options.options];
 							solutionText = options.options[correctKey as keyof typeof options.options] || answerSolution;
 						} else {
 							correct = false;
 							solutionText = answerSolution;
 						}
-
 					} else {
 						correct = userSolutionText === answerSolution;
 						solutionText = answerSolution;
@@ -170,7 +153,25 @@ export default function FillBlanksSolutions({
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: correctUserSolutions!, score: calculateScore(), type})}
+					className="max-w-[200px] w-full"
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: correctUserSolutions!, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="bg-mti-gray-smoke rounded-xl px-5 py-6">
 					{correctUserSolutions &&
@@ -203,13 +204,7 @@ export default function FillBlanksSolutions({
 					variant="outline"
 					onClick={() => onBack({exercise: id, solutions: correctUserSolutions!, score: calculateScore(), type})}
 					className="max-w-[200px] w-full"
-					disabled={
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
-						exam &&
-						typeof partIndex !== "undefined" &&
-						exam.module === "level" &&
-						questionIndex === 0 &&
-						partIndex === 0
-					}>
 					Back
 				</Button>
 
@@ -220,6 +215,6 @@ export default function FillBlanksSolutions({
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/InteractiveSpeaking.tsx

@@ -27,10 +27,14 @@ export default function InteractiveSpeaking({
 	const [diffNumber, setDiffNumber] = useState(0);
 
 	const tooltips: {[key: string]: string} = {
-		"Grammatical Range and Accuracy": "Assesses the variety and correctness of grammatical structures used. A higher score indicates a wide range of complex and accurate grammar; a lower score suggests the need for more basic grammar practice.",
+		"Grammatical Range and Accuracy":
-		"Fluency and Coherence": "Evaluates smoothness and logical flow of speech. A higher score means natural, effortless speech and clear idea progression; a lower score indicates frequent pauses and difficulty in maintaining coherence.",
+			"Assesses the variety and correctness of grammatical structures used. A higher score indicates a wide range of complex and accurate grammar; a lower score suggests the need for more basic grammar practice.",
-		"Pronunciation": "Measures clarity and accuracy of spoken words. A higher score reflects clear, well-articulated speech with correct intonation; a lower score shows challenges in being understood.",
+		"Fluency and Coherence":
-		"Lexical Resource": "Looks at the range and appropriateness of vocabulary. A higher score demonstrates a rich and precise vocabulary; a lower score suggests limited vocabulary usage and appropriateness.",
+			"Evaluates smoothness and logical flow of speech. A higher score means natural, effortless speech and clear idea progression; a lower score indicates frequent pauses and difficulty in maintaining coherence.",
+		Pronunciation:
+			"Measures clarity and accuracy of spoken words. A higher score reflects clear, well-articulated speech with correct intonation; a lower score shows challenges in being understood.",
+		"Lexical Resource":
+			"Looks at the range and appropriateness of vocabulary. A higher score demonstrates a rich and precise vocabulary; a lower score suggests limited vocabulary usage and appropriateness.",
 	};
 
 	useEffect(() => {
@@ -51,7 +55,41 @@ export default function InteractiveSpeaking({
 	}, [userSolutions]);
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4 w-full">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() =>
+						onBack({
+							exercise: id,
+							solutions: userSolutions,
+							score: {total: 100, missing: 0, correct: speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Back
+				</Button>
+				<Button
+					color="purple"
+					onClick={() =>
+						onNext({
+							exercise: id,
+							solutions: userSolutions,
+							score: {
+								total: 100,
+								missing: 0,
+								correct: userSolutions[0]?.evaluation ? speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 : 0,
+							},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<Modal title={`Correction (Prompt ${diffNumber})`} isOpen={diffNumber !== 0} onClose={() => setDiffNumber(0)}>
 				<>
 					{userSolutions &&
@@ -122,13 +160,13 @@ export default function InteractiveSpeaking({
 								{userSolutions &&
 									userSolutions.length > 0 &&
 									userSolutions[0].evaluation &&
-									userSolutions[0].evaluation[`transcript_${(index + 1)}`] &&
+									userSolutions[0].evaluation[`transcript_${index + 1}`] &&
-									userSolutions[0].evaluation[`fixed_text_${(index + 1)}`] && (
+									userSolutions[0].evaluation[`fixed_text_${index + 1}`] && (
 										<Button
 											className="w-full max-w-[180px] !py-2 self-center"
 											color="pink"
 											variant="outline"
-											onClick={() => setDiffNumber((index + 1))}>
+											onClick={() => setDiffNumber(index + 1)}>
 											View Correction
 										</Button>
 									)}
@@ -144,9 +182,13 @@ export default function InteractiveSpeaking({
 									const grade: number = typeof taskResponse === "number" ? taskResponse : taskResponse.grade;
 
 									return (
-										<div className={clsx("bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 tooltip tooltip-bottom",
+										<div
-											index === 0 && "tooltip-right"
+											className={clsx(
-										)} key={key} data-tip={tooltips[key] || "No additional information available"}>
+												"bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 tooltip tooltip-bottom",
+												index === 0 && "tooltip-right",
+											)}
+											key={key}
+											data-tip={tooltips[key] || "No additional information available"}>
 											{key}: Level {grade}
 										</div>
 									);
@@ -178,7 +220,9 @@ export default function InteractiveSpeaking({
 											}>
 											Evaluation
 										</Tab>
-										{Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).map((key, index) => (
+										{Object.keys(userSolutions[0].evaluation)
+											.filter((x) => x.startsWith("perfect_answer"))
+											.map((key, index) => (
 												<Tab
 													key={key}
 													className={({selected}) =>
@@ -186,10 +230,14 @@ export default function InteractiveSpeaking({
 															"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
 															"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
 															"transition duration-300 ease-in-out",
-														selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
+															selected
+																? "bg-white shadow"
+																: "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
 														)
 													}>
-												Recommended Answer<br />(Prompt {index + 1})
+													Recommended Answer
+													<br />
+													(Prompt {index + 1})
 												</Tab>
 											))}
 									</Tab.List>
@@ -202,10 +250,16 @@ export default function InteractiveSpeaking({
 
 													return (
 														<div key={key} className="flex flex-col gap-2">
-															<div className={clsx("bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 w-fit")} key={key}>
+															<div
+																className={clsx(
+																	"bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 w-fit",
+																)}
+																key={key}>
 																{key}: Level {grade}
 															</div>
-															{typeof taskResponse !== "number" && <span className="px-2 py-2">{taskResponse.comment}</span>}
+															{typeof taskResponse !== "number" && (
+																<span className="px-2 py-2">{taskResponse.comment}</span>
+															)}
 														</div>
 													);
 												})}
@@ -214,10 +268,15 @@ export default function InteractiveSpeaking({
 										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
 											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
 										</Tab.Panel>
-										{Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).map((key, index) => (
+										{Object.keys(userSolutions[0].evaluation)
+											.filter((x) => x.startsWith("perfect_answer"))
+											.map((key, index) => (
 												<Tab.Panel key={key} className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
 													<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-													{userSolutions[0].evaluation![`perfect_answer_${(index + 1)}`].answer.replaceAll(/\s{2,}/g, "\n\n")}
+														{userSolutions[0].evaluation![`perfect_answer_${index + 1}`].answer.replaceAll(
+															/\s{2,}/g,
+															"\n\n",
+														)}
 													</span>
 												</Tab.Panel>
 											))}
@@ -266,6 +325,6 @@ export default function InteractiveSpeaking({
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/MatchSentences.tsx

@@ -75,7 +75,25 @@ export default function MatchSentencesSolutions({
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
+					className="max-w-[200px] w-full"
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
@@ -116,13 +134,7 @@ export default function MatchSentencesSolutions({
 					variant="outline"
 					onClick={() => onBack({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
 					className="max-w-[200px] w-full"
-					disabled={
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
-						exam &&
-						typeof partIndex !== "undefined" &&
-						exam.module === "level" &&
-						questionIndex === 0 &&
-						partIndex === 0
-					}>
 					Back
 				</Button>
 
@@ -133,6 +145,6 @@ export default function MatchSentencesSolutions({
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/MultipleChoice.tsx

@@ -127,8 +127,23 @@ export default function MultipleChoice({id, type, prompt, questions, userSolutio
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4">
-			<div className="flex flex-col gap-4 w-full h-full mb-20">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={back}
+					className="max-w-[200px] w-full"
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
+					Back
+				</Button>
+
+				<Button color="purple" onClick={next} className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
+			<div className="flex flex-col gap-4 w-full h-full mb-20 mt-4">
 				<div className="flex flex-col gap-4 mt-2">
 					<div className="flex flex-col gap-8 h-fit w-full bg-mti-gray-smoke rounded-xl px-16 py-8">
 						{/*<span className="text-xl font-semibold">{prompt}</span>*/}
@@ -180,6 +195,6 @@ export default function MultipleChoice({id, type, prompt, questions, userSolutio
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/Speaking.tsx

@@ -33,14 +33,52 @@ export default function Speaking({ id, type, title, video_url, text, prompts, us
 	}, [userSolutions]);
 
 	const tooltips: {[key: string]: string} = {
-		"Grammatical Range and Accuracy": "Assesses the variety and correctness of grammatical structures used. A higher score indicates a wide range of complex and accurate grammar; a lower score suggests the need for more basic grammar practice.",
+		"Grammatical Range and Accuracy":
-		"Fluency and Coherence": "Evaluates smoothness and logical flow of speech. A higher score means natural, effortless speech and clear idea progression; a lower score indicates frequent pauses and difficulty in maintaining coherence.",
+			"Assesses the variety and correctness of grammatical structures used. A higher score indicates a wide range of complex and accurate grammar; a lower score suggests the need for more basic grammar practice.",
-		"Pronunciation": "Measures clarity and accuracy of spoken words. A higher score reflects clear, well-articulated speech with correct intonation; a lower score shows challenges in being understood.",
+		"Fluency and Coherence":
-		"Lexical Resource": "Looks at the range and appropriateness of vocabulary. A higher score demonstrates a rich and precise vocabulary; a lower score suggests limited vocabulary usage and appropriateness.",
+			"Evaluates smoothness and logical flow of speech. A higher score means natural, effortless speech and clear idea progression; a lower score indicates frequent pauses and difficulty in maintaining coherence.",
+		Pronunciation:
+			"Measures clarity and accuracy of spoken words. A higher score reflects clear, well-articulated speech with correct intonation; a lower score shows challenges in being understood.",
+		"Lexical Resource":
+			"Looks at the range and appropriateness of vocabulary. A higher score demonstrates a rich and precise vocabulary; a lower score suggests limited vocabulary usage and appropriateness.",
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4 w-full">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() =>
+						onBack({
+							exercise: id,
+							solutions: userSolutions,
+							score: {total: 100, missing: 0, correct: speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Back
+				</Button>
+				<Button
+					color="purple"
+					onClick={() =>
+						onNext({
+							exercise: id,
+							solutions: userSolutions,
+							score: {
+								total: 100,
+								missing: 0,
+								correct: userSolutions[0]?.evaluation ? speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 : 0,
+							},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<Modal title="Correction" isOpen={showDiff} onClose={() => setShowDiff(false)}>
 				<>
 					{userSolutions &&
@@ -138,9 +176,13 @@ export default function Speaking({ id, type, title, video_url, text, prompts, us
 									const grade: number = typeof taskResponse === "number" ? taskResponse : taskResponse.grade;
 
 									return (
-										<div className={clsx("bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 tooltip tooltip-bottom",
+										<div
-											index === 0 && "tooltip-right"
+											className={clsx(
-										)} key={key} data-tip={tooltips[key] || "No additional information available"}>
+												"bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 tooltip tooltip-bottom",
+												index === 0 && "tooltip-right",
+											)}
+											key={key}
+											data-tip={tooltips[key] || "No additional information available"}>
 											{key}: Level {grade}
 										</div>
 									);
@@ -194,10 +236,16 @@ export default function Speaking({ id, type, title, video_url, text, prompts, us
 
 													return (
 														<div key={key} className="flex flex-col gap-2">
-															<div className={clsx("bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 w-fit")} key={key}>
+															<div
+																className={clsx(
+																	"bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2 w-fit",
+																)}
+																key={key}>
 																{key}: Level {grade}
 															</div>
-															{typeof taskResponse !== "number" && <span className="px-2 py-2">{taskResponse.comment}</span>}
+															{typeof taskResponse !== "number" && (
+																<span className="px-2 py-2">{taskResponse.comment}</span>
+															)}
 														</div>
 													);
 												})}
@@ -261,6 +309,6 @@ export default function Speaking({ id, type, title, video_url, text, prompts, us
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/TrueFalse.tsx

@@ -40,7 +40,25 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
+					className="max-w-[200px] w-full"
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
@@ -125,13 +143,7 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
 					variant="outline"
 					onClick={() => onBack({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
 					className="max-w-[200px] w-full"
-					disabled={
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
-						exam &&
-						typeof partIndex !== "undefined" &&
-						exam.module === "level" &&
-						questionIndex === 0 &&
-						partIndex === 0
-					}>
 					Back
 				</Button>
 
@@ -142,6 +154,6 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/WriteBlanks.tsx

@@ -105,7 +105,25 @@ export default function WriteBlanksSolutions({
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4">
+			<div className="flex justify-between w-full gap-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() => onBack({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
+					className="max-w-[200px] w-full"
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
+					Back
+				</Button>
+
+				<Button
+					color="purple"
+					onClick={() => onNext({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			<div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
@@ -146,13 +164,7 @@ export default function WriteBlanksSolutions({
 					variant="outline"
 					onClick={() => onBack({exercise: id, solutions: userSolutions, score: calculateScore(), type})}
 					className="max-w-[200px] w-full"
-					disabled={
+					disabled={exam && typeof partIndex !== "undefined" && exam.module === "level" && questionIndex === 0 && partIndex === 0}>
-						exam &&
-						typeof partIndex !== "undefined" &&
-						exam.module === "level" &&
-						questionIndex === 0 &&
-						partIndex === 0
-					}>
 					Back
 				</Button>
 
@@ -163,6 +175,6 @@ export default function WriteBlanksSolutions({
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }

src/components/Solutions/Writing.tsx

@@ -19,14 +19,52 @@ export default function Writing({ id, type, prompt, attachment, userSolutions, o
 	const aiEval = userSolutions && userSolutions.length > 0 ? userSolutions[0].evaluation?.ai_detection : undefined;
 
 	const tooltips: {[key: string]: string} = {
-		"Lexical Resource": "Assesses the diversity and accuracy of vocabulary used. A higher score indicates varied and precise word choice; a lower score points to limited vocabulary and inaccuracies.",
+		"Lexical Resource":
-		"Task Achievement": "Evaluates how well the task requirements are fulfilled. A higher score means all parts of the task are addressed thoroughly; a lower score shows incomplete or inadequate task response.",
+			"Assesses the diversity and accuracy of vocabulary used. A higher score indicates varied and precise word choice; a lower score points to limited vocabulary and inaccuracies.",
-		"Coherence and Cohesion": "Measures logical organization and flow of writing. A higher score reflects well-structured and connected ideas; a lower score indicates disorganized writing and poor linkage between ideas.",
+		"Task Achievement":
-		"Grammatical Range and Accuracy": "Looks at the range and precision of grammatical structures. A higher score shows varied and accurate grammar use; a lower score suggests frequent errors and limited range.",
+			"Evaluates how well the task requirements are fulfilled. A higher score means all parts of the task are addressed thoroughly; a lower score shows incomplete or inadequate task response.",
+		"Coherence and Cohesion":
+			"Measures logical organization and flow of writing. A higher score reflects well-structured and connected ideas; a lower score indicates disorganized writing and poor linkage between ideas.",
+		"Grammatical Range and Accuracy":
+			"Looks at the range and precision of grammatical structures. A higher score shows varied and accurate grammar use; a lower score suggests frequent errors and limited range.",
 	};
 
 	return (
-		<>
+		<div className="flex flex-col gap-4 mt-4">
+			<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() =>
+						onBack({
+							exercise: id,
+							solutions: userSolutions,
+							score: {total: 100, missing: 0, correct: writingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Back
+				</Button>
+				<Button
+					color="purple"
+					onClick={() =>
+						onNext({
+							exercise: id,
+							solutions: userSolutions,
+							score: {
+								total: 100,
+								missing: 0,
+								correct: userSolutions[0]?.evaluation ? writingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 : 0,
+							},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
+					Next
+				</Button>
+			</div>
+
 			{attachment && (
 				<Transition show={isModalOpen} as={Fragment}>
 					<Dialog onClose={() => setIsModalOpen(false)} className="relative z-50">
@@ -135,10 +173,13 @@ export default function Writing({ id, type, prompt, attachment, userSolutions, o
 									const grade: number = typeof taskResponse === "number" ? taskResponse : taskResponse.grade;
 
 									return (
-										<div className={clsx(
+										<div
+											className={clsx(
 												"bg-ielts-writing text-ielts-writing-light rounded-xl px-4 py-2 tooltip tooltip-bottom",
-											index === 0 && "tooltip-right"
+												index === 0 && "tooltip-right",
-										)} key={key} data-tip={tooltips[key] || "No additional information available"}>
+											)}
+											key={key}
+											data-tip={tooltips[key] || "No additional information available"}>
 											{key}: Level {grade}
 										</div>
 									);
@@ -204,10 +245,16 @@ export default function Writing({ id, type, prompt, attachment, userSolutions, o
 
 													return (
 														<div key={key} className="flex flex-col gap-2">
-															<div className={clsx("bg-ielts-writing text-ielts-writing-light rounded-xl px-4 py-2 w-fit")} key={key}>
+															<div
+																className={clsx(
+																	"bg-ielts-writing text-ielts-writing-light rounded-xl px-4 py-2 w-fit",
+																)}
+																key={key}>
 																{key}: Level {grade}
 															</div>
-															{typeof taskResponse !== "number" && <span className="px-2 py-2">{taskResponse.comment}</span>}
+															{typeof taskResponse !== "number" && (
+																<span className="px-2 py-2">{taskResponse.comment}</span>
+															)}
 														</div>
 													);
 												})}
@@ -273,6 +320,6 @@ export default function Writing({ id, type, prompt, attachment, userSolutions, o
 					Next
 				</Button>
 			</div>
-		</>
+		</div>
 	);
 }