diff --git a/components/MetadataModal.tsx b/components/MetadataModal.tsx
index c6803d2..66d2670 100644
--- a/components/MetadataModal.tsx
+++ b/components/MetadataModal.tsx
@@ -4,6 +4,7 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { useMetadataAttributesState } from 'components/forms/MetadataAttributes.hooks'
 import { useEffect, useState } from 'react'
+import toast from 'react-hot-toast'
 
 import Button from './Button'
 import { TextInput } from './forms/FormInput'
@@ -123,6 +124,7 @@ export const MetadataModal = (props: MetadataModalProps) => {
 
     const editedMetadataFile = new File([metadataFileBlob], metadataFile.name, { type: 'application/json' })
     props.updateMetadata(editedMetadataFile)
+    toast.success('Metadata updated successfully.')
     console.log(editedMetadataFile)
   }
 
diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index 46d4108..f63bc93 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -171,9 +171,13 @@ const CollectionCreationPage: NextPage = () => {
               const metadataFileBlob = new Blob([JSON.stringify(data)], {
                 type: 'application/json',
               })
-              const updatedMetadataFile = new File([metadataFileBlob], uploadDetails.metadataFiles[i].name, {
-                type: 'application/json',
-              })
+              const updatedMetadataFile = new File(
+                [metadataFileBlob],
+                uploadDetails.metadataFiles[i].name.substring(0, uploadDetails.metadataFiles[i].name.lastIndexOf('.')),
+                {
+                  type: 'application/json',
+                },
+              )
               fileArray.push(updatedMetadataFile)
             }
             reader.onloadend = () => {
@@ -199,21 +203,21 @@ const CollectionCreationPage: NextPage = () => {
 
   const checkUploadDetails = () => {
     if (!uploadDetails) {
-      throw new Error('Please upload asset and metadata')
+      throw new Error('Please select assets and metadata')
     }
     if (uploadDetails.assetFiles.length === 0) {
-      throw new Error('Please upload assets')
+      throw new Error('Please select the assets')
     }
     if (uploadDetails.metadataFiles.length === 0) {
-      throw new Error('Please upload metadatas')
+      throw new Error('Please select the metadata files')
     }
     compareFileArrays(uploadDetails.assetFiles, uploadDetails.metadataFiles)
     if (uploadDetails.uploadService === 'nft-storage') {
       if (uploadDetails.nftStorageApiKey === '') {
-        throw new Error('Please enter NFT Storage api key')
+        throw new Error('Please enter a valid NFT Storage API key')
       }
     } else if (uploadDetails.pinataApiKey === '' || uploadDetails.pinataSecretKey === '') {
-      throw new Error('Please enter Pinata api key and secret key')
+      throw new Error('Please enter Pinata API and secret keys')
     }
   }