diff --git a/admin-spa/src/App.tsx b/admin-spa/src/App.tsx
index fc932e2..ebe74bc 100644
--- a/admin-spa/src/App.tsx
+++ b/admin-spa/src/App.tsx
@@ -257,9 +257,21 @@ function AddonRoute({ config }: { config: any }) {
 }
 
 function Header({ onFullscreen, fullscreen, showToggle = true }: { onFullscreen: () => void; fullscreen: boolean; showToggle?: boolean }) {
-  const siteTitle = (window as any).wnw?.siteTitle || 'WooNooW';
+  const [siteTitle, setSiteTitle] = React.useState((window as any).wnw?.siteTitle || 'WooNooW');
   const isStandalone = window.WNW_CONFIG?.standaloneMode ?? false;
   
+  // Listen for store settings updates
+  React.useEffect(() => {
+    const handleStoreUpdate = (event: CustomEvent) => {
+      if (event.detail?.store_name) {
+        setSiteTitle(event.detail.store_name);
+      }
+    };
+    
+    window.addEventListener('woonoow:store:updated' as any, handleStoreUpdate);
+    return () => window.removeEventListener('woonoow:store:updated' as any, handleStoreUpdate);
+  }, []);
+  
   const handleLogout = async () => {
     try {
       await fetch((window.WNW_CONFIG?.restUrl || '') + '/auth/logout', {
@@ -406,7 +418,7 @@ function Shell() {
                 {isDashboardRoute ? (
                   <DashboardSubmenuBar items={main.children} fullscreen={true} />
                 ) : (
-                  <SubmenuBar items={main.children} />
+                  <SubmenuBar items={main.children} fullscreen={true} />
                 )}
                 <div className="p-4">
                   <AppRoutes />
@@ -419,7 +431,7 @@ function Shell() {
               {isDashboardRoute ? (
                 <DashboardSubmenuBar items={main.children} fullscreen={true} />
               ) : (
-                <SubmenuBar items={main.children} />
+                <SubmenuBar items={main.children} fullscreen={true} />
               )}
               <main className="flex-1 p-4 overflow-auto">
                 <AppRoutes />
@@ -432,7 +444,7 @@ function Shell() {
             {isDashboardRoute ? (
               <DashboardSubmenuBar items={main.children} fullscreen={false} />
             ) : (
-              <SubmenuBar items={main.children} />
+              <SubmenuBar items={main.children} fullscreen={false} />
             )}
             <main className="flex-1 p-4 overflow-auto">
               <AppRoutes />
diff --git a/admin-spa/src/routes/Dashboard/index.tsx b/admin-spa/src/routes/Dashboard/index.tsx
index 370542d..8e35cb1 100644
--- a/admin-spa/src/routes/Dashboard/index.tsx
+++ b/admin-spa/src/routes/Dashboard/index.tsx
@@ -281,7 +281,7 @@ export default function Dashboard() {
   };
 
   return (
-    <div className="space-y-6 p-6 pb-6">
+    <div className="space-y-6 lg:p-6 pb-6">
       {/* Header */}
       <div className="mb-6">
         <h1 className="text-2xl font-bold">{__('Dashboard')}</h1>
diff --git a/admin-spa/src/routes/Settings/Payments.tsx b/admin-spa/src/routes/Settings/Payments.tsx
index d8d8196..d58fc88 100644
--- a/admin-spa/src/routes/Settings/Payments.tsx
+++ b/admin-spa/src/routes/Settings/Payments.tsx
@@ -117,26 +117,19 @@ export default function PaymentsPage() {
   // Initialize order from saved order or gateways
   React.useEffect(() => {
     if (gateways.length > 0 && manualOrder.length === 0 && onlineOrder.length === 0) {
-      console.log('Initializing gateway order...');
-      console.log('All gateways:', gateways.map((g: PaymentGateway) => ({ id: g.id, type: g.type })));
-      console.log('Saved order:', savedOrder);
       
       // Use saved order if available, otherwise use gateway order
       if (savedOrder.manual.length > 0) {
-        console.log('Using saved manual order:', savedOrder.manual);
         setManualOrder(savedOrder.manual);
       } else {
         const manual = gateways.filter((g: PaymentGateway) => g.type === 'manual').map((g: PaymentGateway) => g.id);
-        console.log('Using gateway manual order:', manual);
         setManualOrder(manual);
       }
       
       if (savedOrder.online.length > 0) {
-        console.log('Using saved online order:', savedOrder.online);
         setOnlineOrder(savedOrder.online);
       } else {
         const online = gateways.filter((g: PaymentGateway) => g.type === 'provider' || g.type === 'other').map((g: PaymentGateway) => g.id);
-        console.log('Using gateway online order:', online);
         setOnlineOrder(online);
       }
     }
@@ -197,7 +190,6 @@ export default function PaymentsPage() {
     
     // Save order to backend
     try {
-      console.log('Saving manual order:', newOrder);
       await api.post('/payments/gateways/order', {
         category: 'manual',
         order: newOrder,
@@ -225,7 +217,6 @@ export default function PaymentsPage() {
     
     // Save order to backend
     try {
-      console.log('Saving online order:', newOrder);
       await api.post('/payments/gateways/order', {
         category: 'online',
         order: newOrder,
diff --git a/admin-spa/src/routes/Settings/Store.tsx b/admin-spa/src/routes/Settings/Store.tsx
index 5c3301e..a09c424 100644
--- a/admin-spa/src/routes/Settings/Store.tsx
+++ b/admin-spa/src/routes/Settings/Store.tsx
@@ -137,6 +137,11 @@ export default function StoreDetailsPage() {
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['store-settings'] });
       toast.success('Your store details have been updated successfully.');
+      
+      // Dispatch event to update site title in header
+      window.dispatchEvent(new CustomEvent('woonoow:store:updated', {
+        detail: { store_name: settings.storeName }
+      }));
     },
     onError: () => {
       toast.error('Failed to save store settings');
diff --git a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
index 53a64ed..2bc255c 100644
--- a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
+++ b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
@@ -34,10 +34,10 @@ export function SettingsLayout({
   };
 
   return (
-    <div className="min-h-screen bg-background">
-      {/* Sticky Header with Save Button */}
+    <div className="space-y-6 lg:p-6 pb-6">
+      {/* Sticky Header with Save Button - Edge to edge */}
       {onSave && (
-        <div className="sticky top-0 z-10 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
+        <div className="sticky top-[49px] z-10 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 -mx-4 px-4 lg:-mx-6 lg:px-6">
           <div className="container px-0 max-w-5xl mx-auto py-3 flex items-center justify-between">
             <div>
               <h1 className="text-lg font-semibold">{title}</h1>