diff --git a/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseDetailHeroSection.tsx b/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseDetailHeroSection.tsx
index 42b170e..5828c07 100644
--- a/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseDetailHeroSection.tsx
+++ b/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseDetailHeroSection.tsx
@@ -32,7 +32,7 @@ const CourseDetailHeroSection: React.FC<CourseDetailHeroSectionProps> = ({ cours
         const formData = new FormData();
         formData.append('course_uuid' , courseData.id)
         try{
-            const res = await fetch(APP_BASE_URL + '' , {
+            const res = await fetch(APP_BASE_URL + '/api/course/enroll' , {
                 headers : fetchHeader() ,
                 method : 'POST' , 
                 body : formData
@@ -97,7 +97,7 @@ const CourseDetailHeroSection: React.FC<CourseDetailHeroSectionProps> = ({ cours
                       />
                     </div>
                     {
-                        courseData?.selfEnrollment?.isEnrolled && 
+                        ! courseData?.selfEnrollment?.isEnrolled && 
                         <Button className="w-full text-lg h-12 bg-purple-700" onClick={handleEnrollNow}>
                             {
                                 loading ? 
diff --git a/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseGenerateQuestions.tsx b/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseGenerateQuestions.tsx
index e247942..fc11abd 100644
--- a/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseGenerateQuestions.tsx
+++ b/frontend/edu-connect/src/app/courses/show/[id]/_partials/CourseGenerateQuestions.tsx
@@ -11,6 +11,7 @@ import { APP_BASE_URL } from '@/utils/constants';
 import { defaultFetcher } from '@/helpers/fetch.helper';
 import { getEduConnectAccessToken } from '@/helpers/token.helper';
 import { useToast } from '@/hooks/use-toast';
+import { usePathname } from 'next/navigation';
 
 interface Course {
   id: number;
@@ -49,15 +50,18 @@ const QuizGenerator: React.FC<QuizGeneratorProps> = ({
   current_page,
   course_uuid , 
 }) => {
+
+  const pathname = usePathname()
+  const id = pathname.split('/')?.at(-1)
   const { data: completedQuizzes, error: completedError } = useSWR<any>(
-    `${APP_BASE_URL}/api/quiz/get/allComplete?course_uuid=${course_uuid}`,
+    `${APP_BASE_URL}/api/quiz/get/allComplete?course_id=${id}`,
     defaultFetcher
   );
 
   const { toast } = useToast()
 
   const { data: uncompletedQuizzes, error: uncompletedError , mutate } = useSWR<any>(
-    `${APP_BASE_URL}/api/quiz/get/personalIncomplete?course_uuid=${course_uuid}`,
+    `${APP_BASE_URL}/api/quiz/get/personalIncomplete?course_id=${id}`,
     defaultFetcher
   );
 
@@ -110,7 +114,7 @@ const QuizGenerator: React.FC<QuizGeneratorProps> = ({
     try{
       const formData = new FormData();
 
-      formData.append('course_uuid' , course_uuid);
+      formData.append('course_id' , course_uuid);
       formData.append('page' , (current_page + 1)?.toString())
       const res = await fetch(APP_BASE_URL + '/api/quiz/generate' , {
         headers : {
@@ -155,8 +159,8 @@ const QuizGenerator: React.FC<QuizGeneratorProps> = ({
                         by {quiz.creator.firstName} {quiz.creator.lastName}
                       </span>
                     </div>
-                    <div className="text-sm space-y-2">
-                      {quiz.quizAnswers.map((answer, i) => (
+                    {/* <div className="text-sm space-y-2">
+                      {quiz?.quizAnswers && quiz?.quizAnswers?.map((answer, i) => (
                         <div 
                           key={i} 
                           className={`p-2 rounded flex justify-between items-center ${
@@ -178,7 +182,7 @@ const QuizGenerator: React.FC<QuizGeneratorProps> = ({
                           )}
                         </div>
                       ))}
-                    </div>
+                    </div> */}
                   </div>
                   {index < completedQuizzes?.length - 1 && <Separator className="my-4" />}
                 </div>