diff --git a/modules/assessment/component/AssessmentPreview.tsx b/modules/assessment/component/AssessmentPreview.tsx
index 7a7d06839..33d6838ed 100644
--- a/modules/assessment/component/AssessmentPreview.tsx
+++ b/modules/assessment/component/AssessmentPreview.tsx
@@ -101,7 +101,7 @@ export default function Preview() {
                 className="py-[32px] px-[24px] border border-[#DFE3E6] rounded-[16px] mt-6 w-[328px] md:w-[608px]"
               >
                 <h1 className=" text-[#009254] font-bold text-[22px] text-center font-manrope leading-7 mb-5">
-                  Question {assessment.question_no} out of 10
+                  Question {assessment.question_no} out of {assessments.length}
                 </h1>
                 <div className="pl-6">
                   <p className="font-normal mb-3 font-manrope leading-5 text-[#2E3130]">{assessment.question_text}</p>
diff --git a/modules/assessment/component/editLayout.tsx b/modules/assessment/component/editLayout.tsx
index 99007ab67..33df64479 100644
--- a/modules/assessment/component/editLayout.tsx
+++ b/modules/assessment/component/editLayout.tsx
@@ -21,8 +21,10 @@ type QuestionType = {
 };
 
 // const initialOptions: string[] = ["Option 1", "Option 2", "Option 3", "Option 4"];
-const EditLayout = () => {
-  const notify = () => toast('Assessment updated successfully, You can go back');
+const EditLayout = ({}) => {
+  const notifySuccess = () => toast('Assessment updated successfully, You can go back');
+  const notifyFailure = () => toast('Assessment did not update, Try again');
+  const [editDisabled, setEditDisabled] = useState(false);
   const [loading, setLoading] = useState(true);
   const navigate = useRouter();
   const router = useRouter();
@@ -171,10 +173,13 @@ const EditLayout = () => {
       const data = await response.json();
       console.log('Assessment updated successfully:', data);
       // alert('Assessment updated successfully, You can go back');
-      notify();
+      setEditDisabled(false);
+      notifySuccess();
       <ToastContainer />;
     } catch (error) {
       console.error('Error:', error);
+      setEditDisabled(false);
+      notifyFailure();
     }
   }
 
@@ -240,9 +245,9 @@ const EditLayout = () => {
   //   );
   // }
   return loading ? (
-    <div className="fixed bg-brand-green-primary w-full h-full grid place-items-center">
+    <div className="grid place-items-center">
       <div className=" items-center ">
-        <FaSpinner color="#fff" className="animate-spin" size={100} />
+        <FaSpinner color="green" className="animate-spin" size={100} />
       </div>
     </div>
   ) : (
@@ -361,17 +366,41 @@ const EditLayout = () => {
         </Select>
       </div>
 
-      <div className="pt-2">
+      <div className="flex gap-4 items-center pt-2">
         <Button
+          type="button"
           onClick={() => {
+            setEditDisabled(true);
             updateQuestionArray(originalArrayQuestions, newQuestionObject);
           }}
-          intent={'primary'}
-          size={'md'}
-          className="bg-[tansparent] text-dark-100 hover:text-dark-100 hover:bg-[transparent]"
+          disabled={editDisabled}
+          // intent={'primary'}
+          // size={'md'}
+          // className="bg-[tansparent] text-dark-100 hover:text-dark-100 hover:bg-[transparent]"
         >
           Click to Edit
         </Button>
+        {editDisabled && (
+          <div role="status">
+            <svg
+              aria-hidden="true"
+              className="inline w-8 h-8 mr-2 text-white-200 animate-spin dark:text-gray-600 fill-green-500"
+              viewBox="0 0 100 101"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                fill="currentColor"
+              />
+              <path
+                d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                fill="currentFill"
+              />
+            </svg>
+            <span className="sr-only">Loading...</span>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/modules/assessment/component/previewQuests.tsx b/modules/assessment/component/previewQuests.tsx
index eb0ae8930..9ed823eb6 100644
--- a/modules/assessment/component/previewQuests.tsx
+++ b/modules/assessment/component/previewQuests.tsx
@@ -32,6 +32,8 @@ const PreviewQuests = ({
     setCurrentSection((prevStep) => prevStep - 1);
   };
 
+  const handleDeleteQuestion = () => {};
+
   return (
     <React.Fragment>
       <div className="flex flex-col gap-y-3 items-center">
@@ -40,18 +42,20 @@ const PreviewQuests = ({
           return (
             <div
               key={index}
-              className={`w-full border-[1px] border-[#DFE3E6] rounded-[18px] py-10 px-6 relative text-left ${
+              className={`w-full border-[1px] border-[#DFE3E6] rounded-[18px] py-6 px-6 relative text-left ${
                 index === currentSection ? '' : 'hidden'
               }`}
             >
-              <div className=" text-[20px] text-[#009254]">{`Question ${items.question_no} out of 10`}</div>
-              <Link
-                href={`/super-admin/assessment/preview-edit/${items.question_no}?assessmentId=${assessmentId}`}
-                className="absolute top-2 right-10 cursor-pointer"
-              >
-                Edit
-              </Link>
-
+              <div className="flex justify-end gap-4 mb-4">
+                <Link
+                  href={`/super-admin/assessment/preview-edit/${items.question_no}?assessmentId=${assessmentId}`}
+                  className="cursor-pointer"
+                >
+                  Edit
+                </Link>
+                {/* <p className='cursor-pointer'>Delete</p> */}
+              </div>
+              <div className=" text-[20px] text-[#009254]">{`Question ${items.question_no} out of ${questions.length}`}</div>
               <div className="pt-4 text-[14px]">{items.question_text}</div>
               <p className=" text-blue-100 pt-2">Pick only one correct answer</p>
 
diff --git a/pages/super-admin/assessment/preview-edit/index.tsx b/pages/super-admin/assessment/preview-edit/index.tsx
index f8454c67b..f2eda3e69 100644
--- a/pages/super-admin/assessment/preview-edit/index.tsx
+++ b/pages/super-admin/assessment/preview-edit/index.tsx
@@ -164,14 +164,14 @@ const Previewedit: React.FC = () => {
           >
             Questions &amp; Answers
           </div>
-          <div
+          {/* <div
             className={` cursor-pointer ${
               active === 'button2' ? 'text-[#BF8443] font-bold border-b-4 border-[#BF8443]' : 'text-dark-100'
             }`}
             onClick={() => handleClick('button2')}
-          >
+          >git 
             Scoring
-          </div>
+          </div> */}
         </div>
         <div className="w-[\100%\] bg-[#DFE3E6] h-[2px] translate-y-[-8px] "></div>
         {/* Actual layouts */}