diff --git a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js b/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
index e7e37e8..62623e9 100644
--- a/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
+++ b/web/src/components/IdeCascadeStudio/IdeCascadeStudio.js
@@ -76,27 +76,23 @@ const IdeCascadeStudio = ({ part, saveCode, loading }) => {
             // Get the canvas image as a Data URL
             const imgBlob = await CascadeController.capture(threejsViewport.environment)
 
-            async function uploadAndUpdateImage(){
-              // Upload the image to Cloudinary
-              const cloudinaryImg = await uploadToCloudinary(imgBlob)
+            // Upload the image to Cloudinary
+            const cloudinaryImg = await uploadToCloudinary(imgBlob)
 
-              // Save the screenshot as the mainImage
-              saveCode({
-                input: {
-                  code,
-                  title: part?.title,
-                  userId: currentUser?.sub,
-                  description: part?.description,
-                  mainImage: cloudinaryImg.public_id,
-                },
-                id: part.id,
-                isFork: !canEdit,
-              })
+            // Save the screenshot as the mainImage
+            saveCode({
+              input: {
+                code,
+                title: part?.title,
+                userId: currentUser?.sub,
+                description: part?.description,
+                mainImage: cloudinaryImg.public_id,
+              },
+              id: part?.id,
+              isFork: !canEdit,
+            })
 
-              return cloudinaryImg
-            }
-
-            return { image: imgBlob, mainImage: part.mainImage, callback: uploadAndUpdateImage}
+            return { imgBlob, cloudinaryImg }
           }}
         />
       </div>
diff --git a/web/src/components/IdeToolbar/IdeToolbar.js b/web/src/components/IdeToolbar/IdeToolbar.js
index acfb543..efff79e 100644
--- a/web/src/components/IdeToolbar/IdeToolbar.js
+++ b/web/src/components/IdeToolbar/IdeToolbar.js
@@ -112,7 +112,7 @@ const IdeToolbar = ({
     const url = URL.createObjectURL(imgBlob)
     aTag.href= url
     aTag.style.display = 'none'
-    aTag.download = `CodeCad_${ Date.now() }.jpg`
+    aTag.download = `CadHub_${ Date.now() }.jpg`
     aTag.click()
   }
 
@@ -240,7 +240,7 @@ const IdeToolbar = ({
             }}
             className="text-indigo-300 flex items-center pr-6"
           >
-            Capture <Svg name="camera" className="pl-2 w-8" />
+            Set Part Image <Svg name="camera" className="pl-2 w-8" />
           </button>
           <Popover
             id={id}
@@ -256,26 +256,17 @@ const IdeToolbar = ({
                 ? 'Loading...'
                 : <div className="grid grid-cols-2">
                   <div className="rounded m-auto" style={{width: 'fit-content', overflow: 'hidden'}}>
-                    <img src={ window.URL.createObjectURL(captureState.image) } className="w-32" />
+                    <img src={ window.URL.createObjectURL(captureState.imgBlob) } className="w-32" />
                   </div>
                   <div className="p-2 text-indigo-800">
-                    { (captureState.mainImage && !captureState.updated)
-                      ? <button className="flex m-auto mb-4"
-                          onClick={ async () => {
-                            const cloudinaryImg = await captureState.callback()
-                            setCaptureState({...captureState, mainImage: cloudinaryImg.public_id, updated: true })
-                          }}>
-                          <Svg name="refresh" className="mr-2 w-4 text-indigo-600"/> Set Part Image
-                        </button>
-                      : <div className="flex m-auto mb-4">
-                          <Svg name="checkmark" className="mr-2 w-6 text-indigo-600"/> Part Image Set
-                        </div>
-                    }
+                    <div className="flex justify-center mb-4">
+                      <Svg name="checkmark" className="mr-2 w-6 text-indigo-600"/> Part Image Set
+                    </div>
                     <Button
                       iconName="save"
                       className="shadow-md hover:shadow-lg border-indigo-600 border-2 border-opacity-0 hover:border-opacity-100 bg-indigo-800 text-indigo-100 text-opacity-100 bg-opacity-100"
                       shouldAnimateHover
-                      onClick={() => handleDownload(captureState.image)}>
+                      onClick={() => handleDownload(captureState.imgBlob)}>
                       Download
                     </Button>
                   </div>
diff --git a/web/src/components/Svg/Svg.js b/web/src/components/Svg/Svg.js
index 20d8769..47bbb76 100644
--- a/web/src/components/Svg/Svg.js
+++ b/web/src/components/Svg/Svg.js
@@ -38,19 +38,19 @@ const Svg = ({ name, className: className2, strokeWidth = 2 }) => {
         <path
           d="M6 5H4C2.34315 5 1 6.34315 1 8V17C1 18.6569 2.34315 20 4 20H20C21.6569 20 23 18.6569 23 17V8C23 6.34315 21.6569 5 20 5H18"
           stroke="currentColor"
-          stroke-width="2"
-          stroke-linecap="round"/>
+          strokeWidth="2"
+          strokeLinecap="round"/>
         <circle
           cx="12"
           cy="11"
           r="5"
           stroke="currentColor"
-          stroke-width="2"/>
+          strokeWidth="2"/>
         <path
           d="M16 2.68641C14.8716 1.61443 13.5582 1 12.1563 1C10.6229 1 9.19532 1.7351 8 3"
           stroke="currentColor"
-          stroke-width="2"
-          stroke-linecap="round"/>
+          strokeWidth="2"
+          strokeLinecap="round"/>
       </svg>
     ),
     'checkmark': (
@@ -59,8 +59,8 @@ const Svg = ({ name, className: className2, strokeWidth = 2 }) => {
         viewBox="0 0 21 20"
         fill="none">
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M10.3438 19.6875C15.7803 19.6875 20.1875 15.2803 20.1875 9.84375C20.1875 4.4072 15.7803 0 10.3438 0C4.9072 0 0.5 4.4072 0.5 9.84375C0.5 15.2803 4.9072 19.6875 10.3438 19.6875ZM15.3321 6.5547C15.6384 6.09517 15.5142 5.4743 15.0547 5.16795C14.5952 4.8616 13.9743 4.98577 13.6679 5.4453L9.34457 11.9304L7.20711 9.79289C6.81658 9.40237 6.18342 9.40237 5.79289 9.79289C5.40237 10.1834 5.40237 10.8166 5.79289 11.2071L8.79289 14.2071C9.00474 14.419 9.3004 14.5247 9.59854 14.4951C9.89667 14.4656 10.1659 14.304 10.3321 14.0547L15.3321 6.5547Z"
             fill="currentColor"/>
     </svg>),
@@ -319,8 +319,8 @@ const Svg = ({ name, className: className2, strokeWidth = 2 }) => {
         <path
           d="M13 9.9271C13 13.189 10.3137 15.8333 7 15.8333C3.68629 15.8333 1 13.189 1 9.9271C1 6.66517 3.68629 4.02085 7 4.02085C9 4.02085 10.986 4.99917 12 5.77084M12 5.77084L8.33333 7.08334M12 5.77084L10.6667 1.83334"
           stroke="currentColor"
-          stroke-width="2"
-          stroke-linecap="round"/>
+          strokeWidth="2"
+          strokeLinecap="round"/>
       </svg>
     ),
     save: (