diff --git a/app/admin/_components/UploadQuestionsDialog.tsx b/app/admin/_components/UploadQuestionsDialog.tsx
index 3f858a0..793125c 100644
--- a/app/admin/_components/UploadQuestionsDialog.tsx
+++ b/app/admin/_components/UploadQuestionsDialog.tsx
@@ -1,50 +1,63 @@
 'use client'
 
-import { Button, List, ListItem, Text } from '@tremor/react'
-import { clsxm } from '@zolplay/utils'
+import {
+  Badge,
+  Button,
+  type Color,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeaderCell,
+  TableRow,
+  Text,
+} from '@tremor/react'
 import { useRef, useState } from 'react'
+import { useImmer } from 'use-immer'
 
 import { uploadQuestion } from '~/app/admin/action'
 
 import { Dialog } from './ui/Dialog'
 
+type FileStatus = 'Pending' | 'Uploading' | 'Success' | 'Fail'
+const fileStatusColor: Record<FileStatus, Color> = {
+  Pending: 'slate',
+  Uploading: 'amber',
+  Success: 'green',
+  Fail: 'red',
+}
+type QuestionFile = { file: File; status: FileStatus; isAIGenerated: boolean }
+
+const convertFileSizeToMB = (fileSize: number) => {
+  return fileSize / 1024 / 1024
+}
+
 export function UploadQuestionsDialog() {
   const [isOpen, setIsOpen] = useState(false)
-  const [files, setFiles] = useState<File[]>([])
+  const [files, updateFiles] = useImmer<QuestionFile[]>([])
 
   const fileInputRef = useRef<HTMLInputElement>(null)
 
-  const [isLoading, setIsLoading] = useState(false)
+  const noFiles = files.length === 0
+  const canUpload = files.every(({ status }) => status === 'Pending')
+  const isLoading = files.some(({ status }) => status === 'Uploading')
   const handleSubmit = async () => {
-    setIsLoading(true)
-    const results = await Promise.allSettled(
-      files.map(async (file) => {
-        const data = new FormData()
-        data.append('file', file)
-        await uploadQuestion(data)
+    await Promise.all(
+      files.map(async ({ file, isAIGenerated }, i) => {
+        updateFiles((draftFiles) => {
+          draftFiles[i]!.status = 'Uploading'
+        })
+        const fileFormData = new FormData()
+        fileFormData.append('file', file)
+        const { success } = await uploadQuestion({
+          fileFormData,
+          isAIGenerated,
+        })
+        updateFiles((draftFiles) => {
+          draftFiles[i]!.status = success ? 'Success' : 'Fail'
+        })
       })
     )
-
-    setIsOpen(false)
-    setFiles([])
-    setIsLoading(false)
-
-    const total = results.length
-    const successLength = results.filter(
-      (res) => res.status === 'fulfilled'
-    ).length
-    const errorLength = results.filter(
-      (res) => res.status === 'rejected'
-    ).length
-    if (total === successLength) {
-      alert(`${total} files uploaded successfully!`)
-    } else if (total > successLength) {
-      alert(
-        `${errorLength} out of ${total} files failed to upload successfully`
-      )
-    } else {
-      alert(`${total} files failed to upload successfully`)
-    }
   }
 
   return (
@@ -63,7 +76,25 @@ export function UploadQuestionsDialog() {
           multiple
           hidden
           onChange={(e) => {
-            setFiles(Array.from(e.target.files || [], (file) => file))
+            updateFiles(
+              Array.from(e.target.files || [], (file) => file)
+                .filter((file) => {
+                  if (convertFileSizeToMB(file.size) > 10) {
+                    alert(`${file.name} is greater than 10 MB`)
+                    return false
+                  } else {
+                    return true
+                  }
+                })
+                .map(
+                  (file) =>
+                    ({
+                      file,
+                      isAIGenerated: false,
+                      status: 'Pending',
+                    } satisfies QuestionFile)
+                )
+            )
           }}
         />
         <Text>
@@ -75,28 +106,66 @@ export function UploadQuestionsDialog() {
             Cloudflare Document
           </a>
         </Text>
-        <List>
-          {files.map((file, i) => (
-            <ListItem
-              key={i}
-              className={clsxm(
-                file.size / 1024 / 1024 > 10 && 'text-[#ef4444]'
-              )}
-            >
-              <span>{file.name}</span>
-              <span>{(file.size / 1024 / 1024).toFixed(2)} MB</span>
-            </ListItem>
-          ))}
-        </List>
+        {!noFiles && (
+          <Table>
+            <TableHead>
+              <TableRow>
+                <TableHeaderCell>Filename</TableHeaderCell>
+                <TableHeaderCell>Size</TableHeaderCell>
+                <TableHeaderCell>Status</TableHeaderCell>
+                <TableHeaderCell>
+                  AI Generated{' '}
+                  <input
+                    type="checkbox"
+                    checked={files.every(({ isAIGenerated }) => isAIGenerated)}
+                    onChange={(e) => {
+                      updateFiles((draftFiles) =>
+                        draftFiles.forEach((file) => {
+                          file.isAIGenerated = e.target.checked
+                        })
+                      )
+                    }}
+                    disabled={!canUpload}
+                  />
+                </TableHeaderCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {files.map(({ file, status, isAIGenerated }, i) => (
+                <TableRow key={i}>
+                  <TableCell>{file.name}</TableCell>
+                  <TableCell>
+                    {convertFileSizeToMB(file.size).toFixed(2)} MB
+                  </TableCell>
+                  <TableCell>
+                    <Badge color={fileStatusColor[status]}>{status}</Badge>
+                  </TableCell>
+                  <TableCell className="text-right">
+                    <input
+                      type="checkbox"
+                      checked={isAIGenerated}
+                      onChange={(e) => {
+                        updateFiles((draftFiles) => {
+                          draftFiles[i]!.isAIGenerated = e.target.checked
+                        })
+                      }}
+                      disabled={!canUpload}
+                    />
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        )}
         <div className="flex justify-between">
           <Button
             onClick={() => fileInputRef.current?.click()}
             variant="secondary"
           >
-            Select Images
+            {noFiles ? 'Select' : 'Reselect'} Images
           </Button>
           <Button
-            disabled={files?.length === 0}
+            disabled={noFiles || !canUpload}
             onClick={handleSubmit}
             loading={isLoading}
           >
diff --git a/app/admin/action.ts b/app/admin/action.ts
index bfe3d6a..feee694 100644
--- a/app/admin/action.ts
+++ b/app/admin/action.ts
@@ -65,21 +65,32 @@ type CloudflareUploadResponse = {
   }
 }
 
-export async function uploadQuestion(data: FormData) {
+export async function uploadQuestion({
+  fileFormData,
+  isAIGenerated,
+}: {
+  fileFormData: FormData
+  isAIGenerated: boolean
+}): Promise<{ success: boolean }> {
   // Upload image to cloudflare
   const url = `https://api.cloudflare.com/client/v4/accounts/${env.NEXT_PUBLIC_CLOUDFLARE_ACCOUNT_ID}/images/v1`
-  const fetchRes = await fetch(url, {
-    body: data,
+  const cloudflareFetchRes = await fetch(url, {
+    body: fileFormData,
     method: 'POST',
     headers: {
       Authorization: 'Bearer ' + env.CLOUDFLARE_API_TOKEN,
     },
   })
-  const res: CloudflareUploadResponse = await fetchRes.json()
-  if (!res.success) {
-    throw new Error('Cloudflare Error')
+  const cloudflareRes: CloudflareUploadResponse =
+    await cloudflareFetchRes.json()
+  if (!cloudflareRes.success) {
+    // throw new Error('Cloudflare Error')
+    return { success: false }
   }
   // Add image to database
-  await db.insert(questions).values({ image: res.result.id })
+  await db
+    .insert(questions)
+    .values({ image: cloudflareRes.result.id, isAIGenerated })
   revalidatePath('/admin')
+  return { success: true }
 }
diff --git a/package.json b/package.json
index 791bffb..ea28223 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "react-dom": "18.2.0",
     "sharp": "^0.32.6",
     "sqids": "^0.3.0",
+    "use-immer": "^0.9.0",
     "usehooks-ts": "^2.9.1",
     "zod": "^3.21.4",
     "zustand": "^4.3.9"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1a76440..74fd7b6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -68,6 +68,9 @@ dependencies:
   sqids:
     specifier: ^0.3.0
     version: 0.3.0
+  use-immer:
+    specifier: ^0.9.0
+    version: 0.9.0(immer@10.0.2)(react@18.2.0)
   usehooks-ts:
     specifier: ^2.9.1
     version: 2.9.1(react-dom@18.2.0)(react@18.2.0)
@@ -7777,6 +7780,16 @@ packages:
       tslib: 2.6.1
     dev: false
 
+  /use-immer@0.9.0(immer@10.0.2)(react@18.2.0):
+    resolution: {integrity: sha512-/L+enLi0nvuZ6j4WlyK0US9/ECUtV5v9RUbtxnn5+WbtaXYUaOBoKHDNL9I5AETdurQ4rIFIj/s+Z5X80ATyKw==}
+    peerDependencies:
+      immer: '>=2.0.0'
+      react: ^16.8.0 || ^17.0.1 || ^18.0.0
+    dependencies:
+      immer: 10.0.2
+      react: 18.2.0
+    dev: false
+
   /use-sidecar@1.1.2(@types/react@18.2.18)(react@18.2.0):
     resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
     engines: {node: '>=10'}