diff --git a/app/components/imports/ProductForm.vue b/app/components/imports/ProductForm.vue
index 6e0c830..1f74675 100644
--- a/app/components/imports/ProductForm.vue
+++ b/app/components/imports/ProductForm.vue
@@ -390,7 +390,7 @@ async function submit() {
           />
         </div>
       </div>
-      <div class="cell is-col-span-12">
+      <div class="cell is-col-span-12 is-flex is-justify-content-flex-end">
         <button
           :class="['button is-primary', { 'is-loading': isPending }]"
           :disabled="!isDirty"
diff --git a/app/components/imports/ProductVariantFormNew.vue b/app/components/imports/ProductVariantFormNew.vue
index 40d2908..215d157 100644
--- a/app/components/imports/ProductVariantFormNew.vue
+++ b/app/components/imports/ProductVariantFormNew.vue
@@ -192,7 +192,7 @@ async function submit() {
               <div
                 v-if="uploadedImage"
                 class="relative"
-                style="border: 1px solid var(--bulma-grey)"
+                style="border: 1px solid var(--bulma-grey-80)"
               >
                 <figure class="image is-128x128">
                   <img :src="$buildFileUrl(uploadedImage.file)" />
@@ -244,7 +244,7 @@ async function submit() {
           </div>
         </div>
       </div>
-      <div class="cell is-col-span-12">
+      <div class="cell is-col-span-12 is-flex is-justify-content-flex-end">
         <button
           :class="['button is-primary', { 'is-loading': isPending }]"
           :disabled="!body.product || !isDirty"
diff --git a/app/components/imports/Products.vue b/app/components/imports/Products.vue
index 12e26b7..a47eb35 100644
--- a/app/components/imports/Products.vue
+++ b/app/components/imports/Products.vue
@@ -18,7 +18,7 @@ import DataView from "~/components/datatable/DataView.vue";
         component: 'imports/AddProduct',
         title: 'Tạo sản phẩm',
         width: '90%',
-        height: '600px',
+        height: 'auto',
       },
     }"
   />
diff --git a/app/components/media/UploadProgress.vue b/app/components/media/UploadProgress.vue
index 88f2034..bcab1f8 100644
--- a/app/components/media/UploadProgress.vue
+++ b/app/components/media/UploadProgress.vue
@@ -7,22 +7,22 @@
       <span class="icon-text is-gap-1 is-align-items-center">
         <span class="icon">
           <Icon
+            v-if="v.status === 'uploading'"
             name="svg-spinners:180-ring-with-bg"
             :size="22"
             class="has-text-primary"
-            v-if="v.status === 'uploading'"
           />
           <Icon
+            v-else-if="v.status === 'success'"
             name="material-symbols:check-circle-rounded"
             :size="22"
             class="has-text-primary"
-            v-else-if="v.status === 'success'"
           />
           <Icon
+            v-else-if="v.status === 'error'"
             name="material-symbols:cancel-rounded"
             :size="22"
             class="has-text-danger"
-            v-else-if="v.status === 'error'"
           />
         </span>
         <span>{{ v.name }}</span>