diff --git a/app/layouts/admin/form-upload.tsx b/app/layouts/admin/form-upload.tsx
index 425e6c7..0d24d42 100644
--- a/app/layouts/admin/form-upload.tsx
+++ b/app/layouts/admin/form-upload.tsx
@@ -1,10 +1,11 @@
-import { Button, Input } from '@headlessui/react'
+import { Input } from '@headlessui/react'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { useEffect, useState, type ChangeEvent } from 'react'
 import { useFetcher } from 'react-router'
 import { RemixFormProvider, useRemixForm } from 'remix-hook-form'
 import { z } from 'zod'
 
+import { Button } from '~/components/ui/button'
 import { uploadCategorySchema, useAdminContext } from '~/contexts/admin'
 
 export const uploadSchema = z.object({
@@ -17,7 +18,6 @@ export type TUploadSchema = z.infer<typeof uploadSchema>
 export const FormUpload = () => {
   const { isUploadOpen, setUploadedFile } = useAdminContext()
   const fetcher = useFetcher()
-  const [disabled, setDisabled] = useState(false)
   const [error, setError] = useState<string>()
   const maxFileSize = 10 * 1024 // 10MB
 
@@ -32,13 +32,11 @@ export const FormUpload = () => {
   useEffect(() => {
     if (!fetcher.data?.success) {
       setError(fetcher.data?.message)
-      setDisabled(false)
       return
     }
 
     setUploadedFile(fetcher.data.uploadData.data.file_url)
 
-    setDisabled(true)
     setError(undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher])
@@ -110,9 +108,10 @@ export const FormUpload = () => {
           {...register('category')}
         />
         <Button
-          disabled={disabled}
+          disabled={fetcher.state !== 'idle'}
+          isLoading={fetcher.state !== 'idle'}
           type="submit"
-          className="w-full rounded-md bg-[#2E2F7C] py-2 text-white transition hover:bg-blue-800"
+          className="w-full rounded-md py-2"
         >
           Upload
         </Button>
diff --git a/app/pages/form-category/index.tsx b/app/pages/form-category/index.tsx
index 1dce834..b5a60e7 100644
--- a/app/pages/form-category/index.tsx
+++ b/app/pages/form-category/index.tsx
@@ -39,7 +39,6 @@ export const FormCategoryPage = (properties: TProperties) => {
     },
   })
   const [error, setError] = useState<string>()
-  const [disabled, setDisabled] = useState(false)
 
   const { handleSubmit, watch, setValue } = formMethods
   const watchName = watch('name')
@@ -47,11 +46,9 @@ export const FormCategoryPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success) {
       setError(fetcher.data?.message)
-      setDisabled(false)
       return
     }
     navigate('/lg-admin/categories')
-    setDisabled(true)
     setError(undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher])
@@ -96,7 +93,8 @@ export const FormCategoryPage = (properties: TProperties) => {
                 containerClassName="flex-1"
               />
               <Button
-                disabled={disabled}
+                isLoading={fetcher.state !== 'idle'}
+                disabled={fetcher.state !== 'idle'}
                 type="submit"
                 size="lg"
                 className="text-md h-[42px] rounded-md"
diff --git a/app/pages/form-contents/index.tsx b/app/pages/form-contents/index.tsx
index 1e12a67..ff3b054 100644
--- a/app/pages/form-contents/index.tsx
+++ b/app/pages/form-contents/index.tsx
@@ -73,7 +73,6 @@ export const FormContentsPage = (properties: TProperties) => {
   const { categoriesData: categories } = loaderData || {}
   const { tagsData: tags } = loaderData || {}
   const [error, setError] = useState<string>()
-  const [disabled, setDisabled] = useState(false)
 
   const formMethods = useRemixForm<TContentSchema>({
     mode: 'onSubmit',
@@ -100,12 +99,10 @@ export const FormContentsPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success) {
       setError(fetcher.data?.message)
-      setDisabled(false)
       return
     }
 
     navigate('/lg-admin/contents')
-    setDisabled(true)
     setError(undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher])
@@ -144,7 +141,8 @@ export const FormContentsPage = (properties: TProperties) => {
               containerClassName="flex-1"
             />
             <Button
-              disabled={disabled}
+              isLoading={fetcher.state !== 'idle'}
+              disabled={fetcher.state !== 'idle'}
               type="submit"
               size="lg"
               className="text-md h-[42px] rounded-md"
diff --git a/app/pages/form-subscriptions-plan/index.tsx b/app/pages/form-subscriptions-plan/index.tsx
index 0310583..45fcc4a 100644
--- a/app/pages/form-subscriptions-plan/index.tsx
+++ b/app/pages/form-subscriptions-plan/index.tsx
@@ -34,7 +34,6 @@ export const FormSubscribePlanPage = (properties: TProperties) => {
     },
   })
   const [error, setError] = useState<string>()
-  const [disabled, setDisabled] = useState(false)
 
   const { handleSubmit, watch, setValue } = formMethods
   const watchName = watch('name')
@@ -42,11 +41,9 @@ export const FormSubscribePlanPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success) {
       setError(fetcher.data?.message)
-      setDisabled(false)
       return
     }
     navigate('/lg-admin/subscribe-plan')
-    setDisabled(true)
     setError(undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher])
@@ -93,7 +90,8 @@ export const FormSubscribePlanPage = (properties: TProperties) => {
                 containerClassName="flex-1"
               />
               <Button
-                disabled={disabled}
+                disabled={fetcher.state !== 'idle'}
+                isLoading={fetcher.state !== 'idle'}
                 type="submit"
                 size="lg"
                 className="text-md h-[42px] rounded-md"
diff --git a/app/pages/form-tag/index.tsx b/app/pages/form-tag/index.tsx
index 35256ae..91d4c9b 100644
--- a/app/pages/form-tag/index.tsx
+++ b/app/pages/form-tag/index.tsx
@@ -35,7 +35,6 @@ export const FormTagPage = (properties: TProperties) => {
     },
   })
   const [error, setError] = useState<string>()
-  const [disabled, setDisabled] = useState(false)
 
   const { handleSubmit, watch, setValue } = formMethods
   const watchName = watch('name')
@@ -43,11 +42,9 @@ export const FormTagPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success) {
       setError(fetcher.data?.message)
-      setDisabled(false)
       return
     }
     navigate('/lg-admin/tags')
-    setDisabled(true)
     setError(undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher])
@@ -92,7 +89,8 @@ export const FormTagPage = (properties: TProperties) => {
                 containerClassName="flex-1"
               />
               <Button
-                disabled={disabled}
+                isLoading={fetcher.state !== 'idle'}
+                disabled={fetcher.state !== 'idle'}
                 type="submit"
                 size="lg"
                 className="text-md h-[42px] rounded-md"