diff --git a/admin-spa/src/routes/Settings/Payments.tsx b/admin-spa/src/routes/Settings/Payments.tsx
index 55ded37..c0a8ba5 100644
--- a/admin-spa/src/routes/Settings/Payments.tsx
+++ b/admin-spa/src/routes/Settings/Payments.tsx
@@ -113,8 +113,8 @@ export default function PaymentsPage() {
 
   // Categorize gateways
   const manualGateways = gateways.filter((g: PaymentGateway) => g.type === 'manual');
-  const providerGateways = gateways.filter((g: PaymentGateway) => g.type === 'provider');
-  const otherGateways = gateways.filter((g: PaymentGateway) => g.type === 'other');
+  // Combine provider and other into single "3rd party" category
+  const thirdPartyGateways = gateways.filter((g: PaymentGateway) => g.type === 'provider' || g.type === 'other');
 
   if (isLoading) {
     return (
@@ -128,9 +128,10 @@ export default function PaymentsPage() {
 
   return (
     <>
-      <SettingsLayout title="Payments" description="Manage how you get paid">
-        {/* Refresh button */}
-        <div className="flex justify-end mb-4">
+      <SettingsLayout 
+        title="Payments" 
+        description="Manage how you get paid"
+        action={
           <Button
             variant="outline"
             size="sm"
@@ -140,7 +141,8 @@ export default function PaymentsPage() {
             <RefreshCw className="h-4 w-4 mr-2" />
             Refresh
           </Button>
-        </div>
+        }
+      >
 
         {/* Manual Payment Methods - First priority */}
         <SettingsCard
@@ -195,27 +197,14 @@ export default function PaymentsPage() {
           )}
         </SettingsCard>
 
-        {/* Payment Providers - Second priority */}
-        <SettingsCard
-          title="Payment Providers"
-          description="Accept credit cards and digital wallets"
-        >
-          {providerGateways.length === 0 ? (
-            <p className="text-sm text-muted-foreground">
-              No payment providers installed.{' '}
-              <a
-                href="https://woocommerce.com/product-category/woocommerce-extensions/payment-gateways/"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="underline inline-flex items-center gap-1"
-              >
-                Browse payment gateways
-                <ExternalLink className="h-3 w-3" />
-              </a>
-            </p>
-          ) : (
+        {/* 3rd Party Payment Methods - All online payment gateways */}
+        {thirdPartyGateways.length > 0 && (
+          <SettingsCard
+            title="Online Payment Methods"
+            description="Accept credit cards, digital wallets, and other online payments"
+          >
             <div className="space-y-4">
-              {providerGateways.map((gateway: PaymentGateway) => (
+              {thirdPartyGateways.map((gateway: PaymentGateway) => (
                 <div
                   key={gateway.id}
                   className="border rounded-lg p-4 hover:border-primary/50 transition-colors"
@@ -236,9 +225,11 @@ export default function PaymentsPage() {
                             <Badge variant="secondary">○ Disabled</Badge>
                           )}
                         </div>
-                        <p className="text-sm text-muted-foreground mb-2">
-                          {gateway.description}
-                        </p>
+                        {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" />
@@ -270,57 +261,6 @@ export default function PaymentsPage() {
                 </div>
               ))}
             </div>
-          )}
-        </SettingsCard>
-
-        {/* 3rd Party Gateways */}
-        {otherGateways.length > 0 && (
-          <SettingsCard
-            title="3rd Party Payment Methods"
-            description="Additional payment gateways from plugins"
-          >
-            <div className="space-y-4">
-              {otherGateways.map((gateway: PaymentGateway) => (
-                <div
-                  key={gateway.id}
-                  className="border rounded-lg p-4"
-                >
-                  <div className="flex items-center justify-between">
-                    <div className="flex items-center gap-4">
-                      <div className="p-2 bg-muted rounded-lg">
-                        <CreditCard className="h-5 w-5 text-muted-foreground" />
-                      </div>
-                      <div>
-                        <h3 className="font-medium">{gateway.method_title || gateway.title}</h3>
-                        {gateway.method_description && (
-                          <p className="text-sm text-muted-foreground mt-1">
-                            {gateway.method_description}
-                          </p>
-                        )}
-                      </div>
-                    </div>
-                    <div className="flex items-center gap-2">
-                      {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={togglingGateway === gateway.id}
-                      />
-                    </div>
-                  </div>
-                </div>
-              ))}
-            </div>
           </SettingsCard>
         )}
       </SettingsLayout>
@@ -332,7 +272,7 @@ export default function PaymentsPage() {
             <DialogHeader className="px-6 pt-6 pb-4 border-b shrink-0">
               <DialogTitle>{selectedGateway.title} Settings</DialogTitle>
             </DialogHeader>
-            <div className="flex-1 overflow-y-auto px-6 py-4 min-h-0">
+            <div className="flex-1 overflow-y-auto p-6 min-h-0">
               <GenericGatewayForm
                 gateway={selectedGateway}
                 onSave={handleSaveGateway}
@@ -341,20 +281,22 @@ export default function PaymentsPage() {
               />
             </div>
             {/* Footer outside scrollable area */}
-            <div className="border-t px-6 py-4 flex items-center justify-between shrink-0 bg-background">
+            <div className="border-t px-4 sm:px-6 py-3 sm:py-4 flex flex-col sm:flex-row items-stretch sm:items-center gap-2 sm:gap-0 sm:justify-between shrink-0 bg-background sm:rounded-b-lg">
               <Button
                 type="button"
                 variant="outline"
                 onClick={() => setIsModalOpen(false)}
                 disabled={saveMutation.isPending}
+                className="order-3 sm:order-1"
               >
                 Cancel
               </Button>
-              <div className="flex items-center gap-2">
+              <div className="flex flex-col sm:flex-row items-stretch sm:items-center gap-2 order-1 sm:order-2">
                 <Button
                   type="button"
                   variant="ghost"
                   asChild
+                  className="justify-center"
                 >
                   <a
                     href={selectedGateway.wc_settings_url}
@@ -372,6 +314,7 @@ export default function PaymentsPage() {
                     if (form) form.requestSubmit();
                   }}
                   disabled={saveMutation.isPending}
+                  className="order-1 sm:order-2"
                 >
                   {saveMutation.isPending ? 'Saving...' : 'Save Settings'}
                 </Button>
diff --git a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
index 556e4b0..3208703 100644
--- a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
+++ b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
@@ -9,6 +9,7 @@ interface SettingsLayoutProps {
   onSave?: () => Promise<void>;
   saveLabel?: string;
   isLoading?: boolean;
+  action?: React.ReactNode;
 }
 
 export function SettingsLayout({
@@ -18,6 +19,7 @@ export function SettingsLayout({
   onSave,
   saveLabel = 'Save changes',
   isLoading = false,
+  action,
 }: SettingsLayoutProps) {
   const [isSaving, setIsSaving] = useState(false);
 
@@ -62,10 +64,15 @@ export function SettingsLayout({
       <div className="container max-w-5xl mx-auto px-4 py-8">
         {!onSave && (
           <div className="mb-8">
-            <h1 className="text-2xl font-bold tracking-tight">{title}</h1>
-            {description && (
-              <p className="text-muted-foreground mt-2">{description}</p>
-            )}
+            <div className="flex items-start justify-between gap-4">
+              <div>
+                <h1 className="text-2xl font-bold tracking-tight">{title}</h1>
+                {description && (
+                  <p className="text-muted-foreground mt-2">{description}</p>
+                )}
+              </div>
+              {action && <div className="shrink-0">{action}</div>}
+            </div>
           </div>
         )}