diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx
index f4c0fdf0..c55684fa 100644
--- a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx
@@ -92,7 +92,7 @@ function PublishingState() {
 
     async function updateAssignmentPublishState(assignmentUUID: string) {
         const res = await updateAssignment({ published: !assignment?.assignment_object?.published }, assignmentUUID, access_token)
-        const res2 = await updateActivity({ published: !assignment?.assignment_object?.published }, assignment?.activity_object?.activity_uuid, access_token)
+        const res2 = await updateActivity({ published: !assignment?.assignment_object?.published  }, assignment?.activity_object?.activity_uuid, access_token)
         if (res.success && res2) {
             mutate(`${getAPIUrl()}assignments/${assignmentUUID}`)
             toast.success('The assignment has been updated successfully')
diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx b/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx
index e693ab67..264d3ce5 100644
--- a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx
+++ b/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx
@@ -65,6 +65,7 @@ function ActivityElement(props: ActivitiyElementProps) {
   async function changePublicStatus() {
     await updateActivity(
       {
+        ...props.activity,
         published: !props.activity.published,
       },
       props.activity.activity_uuid,
@@ -82,8 +83,8 @@ function ActivityElement(props: ActivitiyElementProps) {
     ) {
       setSelectedActivity(undefined)
       let modifiedActivityCopy = {
+        ...props.activity,
         name: modifiedActivity.activityName,
-        description: '',
       }
 
       await updateActivity(modifiedActivityCopy, activityUUID, access_token)
diff --git a/apps/web/components/Objects/Modals/Activities/Create/NewActivity.tsx b/apps/web/components/Objects/Modals/Activities/Create/NewActivity.tsx
index 16201245..6fc09612 100644
--- a/apps/web/components/Objects/Modals/Activities/Create/NewActivity.tsx
+++ b/apps/web/components/Objects/Modals/Activities/Create/NewActivity.tsx
@@ -30,7 +30,7 @@ function NewActivityModal({
             }}
           >
             <div className="h-20 rounded-lg m-0.5 flex flex-col items-center justify-end text-center bg-white hover:cursor-pointer">
-              <Image quality={100} alt="Dynamic Page" src={DynamicPageActivityImage}></Image>
+              <Image unoptimized quality={100} alt="Dynamic Page" src={DynamicPageActivityImage}></Image>
             </div>
             <div className="flex text-sm h-5 font-medium text-gray-500 items-center justify-center text-center">
               Dynamic Page
@@ -42,7 +42,7 @@ function NewActivityModal({
             }}
           >
             <div className="h-20 rounded-lg m-0.5 flex flex-col items-center justify-end text-center bg-white hover:cursor-pointer">
-              <Image quality={100} alt="Video Page" src={VideoPageActivityImage}></Image>
+              <Image unoptimized quality={100} alt="Video Page" src={VideoPageActivityImage}></Image>
             </div>
             <div className="flex text-sm h-5 font-medium text-gray-500 items-center justify-center text-center">
               Video
@@ -54,7 +54,7 @@ function NewActivityModal({
             }}
           >
             <div className="h-20 rounded-lg m-0.5 flex flex-col items-center justify-end text-center bg-white hover:cursor-pointer">
-              <Image quality={100} alt="Document PDF Page" src={DocumentPdfPageActivityImage}></Image>
+              <Image unoptimized quality={100} alt="Document PDF Page" src={DocumentPdfPageActivityImage}></Image>
             </div>
             <div className="flex text-sm h-5 font-medium text-gray-500 items-center justify-center text-center">
               Document
@@ -66,7 +66,7 @@ function NewActivityModal({
             }}
           >
             <div className="h-20 rounded-lg m-0.5 flex flex-col items-center justify-end text-center bg-white hover:cursor-pointer">
-              <Image quality={100} alt="Assignment Page" src={AssignmentActivityImage}></Image>
+              <Image unoptimized quality={100} alt="Assignment Page" src={AssignmentActivityImage}></Image>
             </div>
             <div className="flex text-sm h-5 font-medium text-gray-500 items-center justify-center text-center">
               Assignments
diff --git a/apps/web/components/Onboarding/Onboarding.tsx b/apps/web/components/Onboarding/Onboarding.tsx
index 7872f751..9fd26726 100644
--- a/apps/web/components/Onboarding/Onboarding.tsx
+++ b/apps/web/components/Onboarding/Onboarding.tsx
@@ -213,7 +213,7 @@ const OnboardingScreen: React.FC<OnboardingScreenProps> = ({
     <div className='flex flex-col'>
       <div className='onboarding_screens flex-col px-4 py-4'>
         <div className='flex-grow rounded-xl'>
-          <Image className='mx-auto shadow-md shadow-gray-200 rounded-lg aspect-auto' alt='' priority quality={100} src={step.imageSrc} />
+          <Image unoptimized className='mx-auto shadow-md shadow-gray-200 rounded-lg aspect-auto' alt='' priority quality={100} src={step.imageSrc} />
         </div>
         <div className='grid grid-flow-col justify-stretch space-x-3 mt-4'>
           {onboardingData.map((_, index) => (
diff --git a/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx b/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx
index ed3ed13d..0aba0032 100644
--- a/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx
+++ b/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx
@@ -48,10 +48,8 @@ function Activity(props: any) {
     ) {
       setSelectedActivity(undefined)
       let modifiedActivityCopy = {
+        ...props.activity,
         name: modifiedActivity.activityName,
-        description: '',
-        type: props.activity.type,
-        content: props.activity.content,
       }
 
       await updateActivity(modifiedActivityCopy, activityId, session.data?.tokens?.access_token)
@@ -155,8 +153,7 @@ function Activity(props: any) {
                 <Link
                   href={
                     getUriWithOrg(props.orgslug, '') +
-                    `/course/${
-                      props.courseid
+                    `/course/${props.courseid
                     }/activity/${props.activity.uuid.replace(
                       'activity_',
                       ''
@@ -172,8 +169,7 @@ function Activity(props: any) {
             <Link
               href={
                 getUriWithOrg(props.orgslug, '') +
-                `/course/${
-                  props.courseid
+                `/course/${props.courseid
                 }/activity/${props.activity.uuid.replace('activity_', '')}`
               }
               className=" hover:cursor-pointer p-1 px-3 bg-gray-200 rounded-md"
diff --git a/apps/web/components/StyledElements/Titles/TypeOfContentTitle.tsx b/apps/web/components/StyledElements/Titles/TypeOfContentTitle.tsx
index 6cfebe68..e7011cb1 100644
--- a/apps/web/components/StyledElements/Titles/TypeOfContentTitle.tsx
+++ b/apps/web/components/StyledElements/Titles/TypeOfContentTitle.tsx
@@ -17,7 +17,7 @@ function TypeOfContentTitle(props: { title: string; type: string }) {
   return (
     <div className="home_category_title flex my-5 items-center">
       <div className="ml-2 rounded-full ring-1 ring-slate-900/5 shadow-inner p-2 my-auto mr-4">
-        <Image className="" src={getLogo()} alt="Courses logo" />
+        <Image unoptimized className="" src={getLogo()} alt="Courses logo" />
       </div>
       <h1 className="font-bold text-2xl">{props.title}</h1>
     </div>