diff --git a/app/form/client.tsx b/app/form/client.tsx
index 2d79dbe..83bbe33 100644
--- a/app/form/client.tsx
+++ b/app/form/client.tsx
@@ -162,6 +162,7 @@ export function FormFillerClient({ form, questions, initialAnswers = {} }: FormF
   }, [form.id, initialAnswers, questions]);
 
   const [otherValues, setOtherValues] = useState<Record<string, string>>(initialOtherValues);
+  const [showSuccessDialog, setShowSuccessDialog] = useState(false);
 
   const methods = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
@@ -208,7 +209,12 @@ export function FormFillerClient({ form, questions, initialAnswers = {} }: FormF
 
       const res = await submitForm(form.id, formattedAnswers);
       if (res.ok) {
-        toast.success(isUpdating ? "อัปเดตฟอร์มสำเร็จ!" : "ส่งฟอร์มสำเร็จ!");
+        if (isUpdating) {
+          toast.success("อัปเดตฟอร์มสำเร็จ!");
+        } else {
+          setShowSuccessDialog(true);
+          router.refresh();
+        }
       }
     } catch (err: any) {
       console.error(err);
@@ -468,7 +474,11 @@ export function FormFillerClient({ form, questions, initialAnswers = {} }: FormF
                 </AlertDialogContent>
               </AlertDialog>
             )}
-            <Button type="submit" disabled={isSubmitting || !form.isOpen} className="min-w-28">
+            <Button 
+              type="submit" 
+              disabled={isSubmitting || !form.isOpen} 
+              className={cn("min-w-28", isUpdating && "bg-green-600 hover:bg-green-700")}
+            >
               {isSubmitting ? (
                 <>
                   <Loader2 className="mr-2 h-4 w-4 animate-spin" />
@@ -483,6 +493,22 @@ export function FormFillerClient({ form, questions, initialAnswers = {} }: FormF
           </div>
         </form>
       </Form>
+
+      <AlertDialog open={showSuccessDialog} onOpenChange={setShowSuccessDialog}>
+        <AlertDialogContent >
+          <AlertDialogHeader>
+            <AlertDialogTitle className="text-2xl text-center font-bold text-primary">ส่งฟอร์มสำเร็จ!</AlertDialogTitle>
+            <AlertDialogDescription >
+              กดอีกครั้งเพื่ออัพเดทคำตอบของคุณ!
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter >
+            <AlertDialogAction onClick={() => setShowSuccessDialog(false)} className="w-full font-bold">
+              ตกลง
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
     </div>
   );
 }
diff --git a/components/html-display.tsx b/components/html-display.tsx
index f6180db..e9ab2e5 100644
--- a/components/html-display.tsx
+++ b/components/html-display.tsx
@@ -10,7 +10,7 @@ export function HtmlDisplay({ html, className, ...props }: HtmlDisplayProps) {
   
   return (
     <div
-      className={cn("prose prose-sm dark:prose-invert max-w-none [&>p]:m-0", className)}
+      className={cn("prose prose-sm dark:prose-invert max-w-none [&>p]:m-0 leading-snug", className)}
       dangerouslySetInnerHTML={{ __html: html }}
       {...props}
     />
diff --git a/components/rich-text-editor.tsx b/components/rich-text-editor.tsx
index 16f1833..5a07799 100644
--- a/components/rich-text-editor.tsx
+++ b/components/rich-text-editor.tsx
@@ -44,7 +44,7 @@ export function RichTextEditor({ value, onChange, placeholder, className }: Rich
     },
     editorProps: {
       attributes: {
-        class: "prose prose-sm dark:prose-invert max-w-none focus:outline-none min-h-[40px] px-3 py-2",
+        class: "prose prose-sm dark:prose-invert max-w-none focus:outline-none min-h-[40px] px-3 py-2 [&>p]:m-0 leading-snug",
       },
     },
     immediatelyRender: false,