diff --git a/app/(main)/quiz/history/page.tsx b/app/(main)/quiz/history/page.tsx
index 25a58a9..fcf7897 100644
--- a/app/(main)/quiz/history/page.tsx
+++ b/app/(main)/quiz/history/page.tsx
@@ -77,37 +77,40 @@ const QuizHistory: React.FC = () => {
             try {
                 const responseData = await QuizService.getQuizCompleted();
                 if (responseData.message === 'Quiz not found') {
-                    setError('Quiz not found');
+                    setError('No history to display');
                     setLoading(false);
                     return;
                 }
                 setQuiz(responseData);
 
                 // Process the data to calculate counts and extract unique topics and skills
-                const processedData = responseData.quizzes.map((quiz: Quiz.QuizTaken) => {
-                    const topicsMap = new Map<number, Topic>();
-                    const skillsMap = new Map<number, Skill>();
-
-                    quiz.mcqs.forEach((mcq: Quiz.Mcq) => {
-                        mcq.topics.forEach((topic) => topicsMap.set(topic.id, topic));
-                        mcq.skills.forEach((skill) => skillsMap.set(skill.id, skill));
-                    });
-
-                    return {
-                        attemptOn: quiz.mcqs[0].attemptOn,
-                        id: quiz.id,
-                        topicsCount: topicsMap.size,
-                        skillsCount: skillsMap.size,
-                        topics: Array.from(topicsMap.values()),
-                        skills: Array.from(skillsMap.values()),
-                        points: quiz.points,
-                        mcqsCount: quiz.mcqs.length
-                    };
-                }).filter(quiz => quiz.attemptOn && !isNaN(new Date(quiz.attemptOn).getTime())).sort((a, b) => new Date(b.attemptOn).getTime() - new Date(a.attemptOn).getTime()); // Sort by attemptOn in descending order
+                const processedData = responseData.quizzes
+                    .map((quiz: Quiz.QuizTaken) => {
+                        const topicsMap = new Map<number, Topic>();
+                        const skillsMap = new Map<number, Skill>();
+
+                        quiz.mcqs.forEach((mcq: Quiz.Mcq) => {
+                            mcq.topics.forEach((topic) => topicsMap.set(topic.id, topic));
+                            mcq.skills.forEach((skill) => skillsMap.set(skill.id, skill));
+                        });
+
+                        return {
+                            attemptOn: quiz.mcqs[0].attemptOn,
+                            id: quiz.id,
+                            topicsCount: topicsMap.size,
+                            skillsCount: skillsMap.size,
+                            topics: Array.from(topicsMap.values()),
+                            skills: Array.from(skillsMap.values()),
+                            points: quiz.points,
+                            mcqsCount: quiz.mcqs.length
+                        };
+                    })
+                    .filter((quiz) => quiz.attemptOn && !isNaN(new Date(quiz.attemptOn).getTime()))
+                    .sort((a, b) => new Date(b.attemptOn).getTime() - new Date(a.attemptOn).getTime()); // Sort by attemptOn in descending order
 
                 setProcessedQuizzes(processedData);
             } catch (error) {
-                setError('Error fetching data');
+                setError('No history to display');
             } finally {
                 setLoading(false);
             }
@@ -127,13 +130,15 @@ const QuizHistory: React.FC = () => {
     const dateBodyTemplate = (rowData: ProcessedQuiz) => {
         const date = new Date(rowData.attemptOn);
 
-        const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${getDayOfWeek(date.getDay())} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`;
+        const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${getDayOfWeek(date.getDay())} ${String(date.getHours()).padStart(2, '0')}:${String(
+            date.getMinutes()
+        ).padStart(2, '0')}:${String(date.getSeconds()).padStart(2, '0')}`;
 
         return <Button key={rowData.attemptOn.toString()} label={formattedDate} onClick={() => handleQuizClick(rowData.id)} />;
     };
 
     const getDayOfWeek = (dayIndex: number) => {
-        const daysOfWeek = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+        const daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
         return daysOfWeek[dayIndex];
     };
 
@@ -142,7 +147,7 @@ const QuizHistory: React.FC = () => {
     }
 
     if (error) {
-        return <div>Error: {error}</div>;
+        return <div className="card">{error}</div>;
     }
 
     return (
diff --git a/app/(main)/quiz/results/page.tsx b/app/(main)/quiz/results/page.tsx
index b0590f4..916948b 100644
--- a/app/(main)/quiz/results/page.tsx
+++ b/app/(main)/quiz/results/page.tsx
@@ -63,4 +63,4 @@ const ResultsPage: React.FC = () => {
     );
 };
 
-export default ResultsPage;
\ No newline at end of file
+export default ResultsPage;
diff --git a/app/(main)/test/page.tsx b/app/(main)/test/page.tsx
index d470b85..1882e4e 100644
--- a/app/(main)/test/page.tsx
+++ b/app/(main)/test/page.tsx
@@ -297,9 +297,7 @@ const QuizPage: React.FC = () => {
                         <div>
                             {/* <b>{selectedQuestionCount ? selectedQuestionCount : generatedQuestionCount} question(s) will be generated.</b> */}
                             <div>
-                                <div className="col-12 md:col-6 mb-5">
-                                    Your tutor hasn&apos;t created a test yet.
-                                </div>
+                                <div className="col-12 md:col-6 mb-5">Your tutor hasn&apos;t created a test yet.</div>
                                 <div className="col-12 md:col-6 mb-5"></div>
                             </div>
                         </div>
diff --git a/components/ResultsTop.tsx b/components/ResultsTop.tsx
index c603912..bd810be 100644
--- a/components/ResultsTop.tsx
+++ b/components/ResultsTop.tsx
@@ -25,7 +25,7 @@ export default function ResultsTopComponent({ onQuestionClick, currentQuestionIn
         const fetchData = async () => {
             try {
                 if (!quizId) {
-                    setError('Quiz ID not found, please select a Quiz from History');
+                    setError('Please select a Quiz from History');
                     setLoading(false);
                     return;
                 }