diff --git a/admin-spa/package-lock.json b/admin-spa/package-lock.json
index cc5e675..f2f83a1 100644
--- a/admin-spa/package-lock.json
+++ b/admin-spa/package-lock.json
@@ -9,6 +9,7 @@
             "version": "0.0.1",
             "dependencies": {
                 "@radix-ui/react-accordion": "^1.2.12",
+                "@radix-ui/react-alert-dialog": "^1.1.15",
                 "@radix-ui/react-avatar": "^1.1.10",
                 "@radix-ui/react-checkbox": "^1.3.3",
                 "@radix-ui/react-dialog": "^1.1.15",
@@ -1191,6 +1192,34 @@
                 }
             }
         },
+        "node_modules/@radix-ui/react-alert-dialog": {
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.15.tgz",
+            "integrity": "sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.3",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-dialog": "1.1.15",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-slot": "1.2.3"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/@radix-ui/react-arrow": {
             "version": "1.1.7",
             "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz",
diff --git a/admin-spa/package.json b/admin-spa/package.json
index de92d7a..d849818 100644
--- a/admin-spa/package.json
+++ b/admin-spa/package.json
@@ -11,6 +11,7 @@
     },
     "dependencies": {
         "@radix-ui/react-accordion": "^1.2.12",
+        "@radix-ui/react-alert-dialog": "^1.1.15",
         "@radix-ui/react-avatar": "^1.1.10",
         "@radix-ui/react-checkbox": "^1.3.3",
         "@radix-ui/react-dialog": "^1.1.15",
diff --git a/admin-spa/src/components/ui/alert-dialog.tsx b/admin-spa/src/components/ui/alert-dialog.tsx
new file mode 100644
index 0000000..fa2b442
--- /dev/null
+++ b/admin-spa/src/components/ui/alert-dialog.tsx
@@ -0,0 +1,139 @@
+import * as React from "react"
+import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
+
+import { cn } from "@/lib/utils"
+import { buttonVariants } from "@/components/ui/button"
+
+const AlertDialog = AlertDialogPrimitive.Root
+
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal
+
+const AlertDialogOverlay = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Overlay
+    className={cn(
+      "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+    ref={ref}
+  />
+))
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName
+
+const AlertDialogContent = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPortal>
+    <AlertDialogOverlay />
+    <AlertDialogPrimitive.Content
+      ref={ref}
+      className={cn(
+        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        className
+      )}
+      {...props}
+    />
+  </AlertDialogPortal>
+))
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName
+
+const AlertDialogHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-2 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+AlertDialogHeader.displayName = "AlertDialogHeader"
+
+const AlertDialogFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+AlertDialogFooter.displayName = "AlertDialogFooter"
+
+const AlertDialogTitle = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Title
+    ref={ref}
+    className={cn("text-lg font-semibold", className)}
+    {...props}
+  />
+))
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName
+
+const AlertDialogDescription = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+AlertDialogDescription.displayName =
+  AlertDialogPrimitive.Description.displayName
+
+const AlertDialogAction = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Action>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Action
+    ref={ref}
+    className={cn(buttonVariants(), className)}
+    {...props}
+  />
+))
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName
+
+const AlertDialogCancel = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Cancel
+    ref={ref}
+    className={cn(
+      buttonVariants({ variant: "outline" }),
+      "mt-2 sm:mt-0",
+      className
+    )}
+    {...props}
+  />
+))
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName
+
+export {
+  AlertDialog,
+  AlertDialogPortal,
+  AlertDialogOverlay,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogHeader,
+  AlertDialogFooter,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogAction,
+  AlertDialogCancel,
+}
diff --git a/admin-spa/src/routes/Settings/Payments.tsx b/admin-spa/src/routes/Settings/Payments.tsx
index e4d6a92..2178ef9 100644
--- a/admin-spa/src/routes/Settings/Payments.tsx
+++ b/admin-spa/src/routes/Settings/Payments.tsx
@@ -9,7 +9,6 @@ import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Alert, AlertDescription } from '@/components/ui/alert';
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@/components/ui/accordion';
 import { CreditCard, Banknote, Settings, RefreshCw, ExternalLink, Loader2, AlertTriangle } from 'lucide-react';
 import { toast } from 'sonner';
 
@@ -116,16 +115,6 @@ export default function PaymentsPage() {
   const manualGateways = gateways.filter((g: PaymentGateway) => g.type === 'manual');
   // Combine provider and other into single "3rd party" category
   const thirdPartyGateways = gateways.filter((g: PaymentGateway) => g.type === 'provider' || g.type === 'other');
-  
-  // Group third party gateways by provider (title)
-  const gatewaysByProvider = thirdPartyGateways.reduce((acc: Record<string, PaymentGateway[]>, gateway: PaymentGateway) => {
-    const provider = gateway.title || 'Other';
-    if (!acc[provider]) {
-      acc[provider] = [];
-    }
-    acc[provider].push(gateway);
-    return acc;
-  }, {});
 
   if (isLoading) {
     return (
@@ -208,87 +197,66 @@ export default function PaymentsPage() {
           )}
         </SettingsCard>
 
-        {/* 3rd Party Payment Methods - Grouped by provider */}
-        {Object.keys(gatewaysByProvider).length > 0 && (
+        {/* Online Payment Methods - Flat list */}
+        {thirdPartyGateways.length > 0 && (
           <SettingsCard
             title="Online Payment Methods"
             description="Accept credit cards, digital wallets, and other online payments"
           >
-            <Accordion type="multiple" className="w-full">
-              {(Object.entries(gatewaysByProvider) as [string, PaymentGateway[]][]).map(([provider, providerGateways]) => (
-                <AccordionItem key={provider} value={provider}>
-                  <AccordionTrigger className="hover:no-underline">
-                    <div className="flex items-center gap-3">
-                      <div className="p-2 bg-primary/10 rounded-lg text-primary">
-                        <CreditCard className="h-5 w-5" />
+            <div className="space-y-4">
+              {thirdPartyGateways.map((gateway: PaymentGateway) => (
+                <div
+                  key={gateway.id}
+                  className="border rounded-lg p-4 hover:border-primary/50 transition-colors"
+                >
+                  <div className="flex items-start justify-between">
+                    <div className="flex items-start gap-4 flex-1">
+                      <div className={`p-2 rounded-lg ${gateway.enabled ? 'bg-green-500/20 text-green-500' : 'bg-primary/10 text-primary'}`}>
+                        <CreditCard className="h-6 w-6" />
                       </div>
-                      <div className="text-left">
-                        <h3 className="font-semibold">{provider}</h3>
-                        <p className="text-sm text-muted-foreground font-normal">
-                          {providerGateways.length} payment {providerGateways.length === 1 ? 'method' : 'methods'}
-                        </p>
-                      </div>
-                    </div>
-                  </AccordionTrigger>
-                  <AccordionContent>
-                    <div className="space-y-3 pt-2">
-                      {providerGateways.map((gateway: PaymentGateway) => (
-                        <div
-                          key={gateway.id}
-                          className="border rounded-lg p-4 hover:border-primary/50 transition-colors"
-                        >
-                          <div className="flex items-start justify-between">
-                            <div className="flex items-start gap-4 flex-1">
-                              <div className={`p-2 rounded-lg ${gateway.enabled ? 'bg-green-500/20 text-green-500' : 'bg-muted text-muted-foreground'}`}>
-                                <CreditCard className="h-5 w-5" />
-                              </div>
-                              <div className="flex-1">
-                                <div className="flex items-center gap-2 mb-1">
-                                  <h4 className="font-medium">
-                                    {gateway.method_title}
-                                  </h4>
-                                </div>
-                                {gateway.method_description && (
-                                  <p className="text-sm text-muted-foreground mb-2">
-                                    {gateway.method_description}
-                                  </p>
-                                )}
-                                {!gateway.requirements.met && (
-                                  <Alert variant="destructive" className="mt-2">
-                                    <AlertTriangle className="h-4 w-4" />
-                                    <AlertDescription>
-                                      Requirements not met: {gateway.requirements.missing.join(', ')}
-                                    </AlertDescription>
-                                  </Alert>
-                                )}
-                              </div>
-                            </div>
-                            <div className="flex items-center gap-0">
-                              {gateway.enabled && (
-                                <Button
-                                  variant="ghost"
-                                  size="sm"
-                                  onClick={() => handleManageGateway(gateway)}
-                                >
-                                  <Settings className="h-4 w-4" />
-                                </Button>
-                              )}
-                              <ToggleField
-                                id={gateway.id}
-                                label=""
-                                checked={gateway.enabled}
-                                onCheckedChange={(checked) => handleToggle(gateway.id, checked)}
-                                disabled={!gateway.requirements.met || togglingGateway === gateway.id}
-                              />
-                            </div>
-                          </div>
+                      <div className="flex-1">
+                        <div className="flex items-center gap-2 mb-1">
+                          <h3 className="font-semibold">
+                            {gateway.method_title || gateway.title}
+                          </h3>
                         </div>
-                      ))}
+                        {gateway.method_description && (
+                          <p className="text-sm text-muted-foreground mb-2">
+                            {gateway.method_description}
+                          </p>
+                        )}
+                        {!gateway.requirements.met && (
+                          <Alert variant="destructive" className="mt-2">
+                            <AlertTriangle className="h-4 w-4" />
+                            <AlertDescription>
+                              Requirements not met: {gateway.requirements.missing.join(', ')}
+                            </AlertDescription>
+                          </Alert>
+                        )}
+                      </div>
                     </div>
-                  </AccordionContent>
-                </AccordionItem>
+                    <div className="flex items-center gap-0">
+                      {gateway.enabled && (
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          onClick={() => handleManageGateway(gateway)}
+                        >
+                          <Settings className="h-4 w-4" />
+                        </Button>
+                      )}
+                      <ToggleField
+                        id={gateway.id}
+                        label=""
+                        checked={gateway.enabled}
+                        onCheckedChange={(checked) => handleToggle(gateway.id, checked)}
+                        disabled={!gateway.requirements.met || togglingGateway === gateway.id}
+                      />
+                    </div>
+                  </div>
+                </div>
               ))}
-            </Accordion>
+            </div>
           </SettingsCard>
         )}
       </SettingsLayout>