diff --git a/admin-spa/src/App.tsx b/admin-spa/src/App.tsx
index 3cbac5b..9131128 100644
--- a/admin-spa/src/App.tsx
+++ b/admin-spa/src/App.tsx
@@ -57,7 +57,7 @@ function useFullscreen() {
         .wnw-fullscreen .woonoow-fullscreen-root {
           position: fixed;
           inset: 0;
-          z-index: 999999;
+          z-index: 9999;
           background: var(--background, #fff);
           height: 100dvh; /* ensure full viewport height on mobile/desktop */
           overflow: hidden; /* prevent double scrollbars; inner <main> handles scrolling */
diff --git a/admin-spa/src/routes/Settings/Payments.tsx b/admin-spa/src/routes/Settings/Payments.tsx
index ee18c1c..6bd69e7 100644
--- a/admin-spa/src/routes/Settings/Payments.tsx
+++ b/admin-spa/src/routes/Settings/Payments.tsx
@@ -82,6 +82,8 @@ export default function PaymentsPage() {
       toast.error('Failed to update gateway');
     },
     onSuccess: () => {
+      // Invalidate to fetch real state from server
+      queryClient.invalidateQueries({ queryKey: ['payment-gateways'] });
       toast.success('Gateway updated successfully');
     },
   });
@@ -303,20 +305,15 @@ export default function PaymentsPage() {
                       </div>
                     </div>
                     <div className="flex items-center gap-2">
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        asChild
-                      >
-                        <a
-                          href={gateway.wc_settings_url}
-                          target="_blank"
-                          rel="noopener noreferrer"
+                      {gateway.enabled && (
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          onClick={() => handleManageGateway(gateway)}
                         >
-                          <ExternalLink className="h-4 w-4 mr-2" />
-                          Configure in WooCommerce
-                        </a>
-                      </Button>
+                          <Settings className="h-4 w-4" />
+                        </Button>
+                      )}
                       <ToggleField
                         id={gateway.id}
                         label=""
diff --git a/includes/Compat/StoreSettingsProvider.php b/includes/Compat/StoreSettingsProvider.php
index 25c5103..8a884d6 100644
--- a/includes/Compat/StoreSettingsProvider.php
+++ b/includes/Compat/StoreSettingsProvider.php
@@ -110,12 +110,17 @@ class StoreSettingsProvider {
      * @return array Store settings
      */
     public static function get_settings(): array {
+        // WooCommerce stores country as "COUNTRY:STATE" format
+        $default_country = get_option('woocommerce_default_country', '');
+        $country_parts = explode(':', $default_country);
+        $country_code = $country_parts[0] ?? '';
+        
         return [
             'store_name' => get_option('blogname', ''),
             'contact_email' => get_option('admin_email', ''),
             'support_email' => get_option('woocommerce_email_from_address', ''),
             'phone' => get_option('woocommerce_store_phone', ''),
-            'country' => get_option('woocommerce_default_country', ''),
+            'country' => $country_code,
             'address' => get_option('woocommerce_store_address', ''),
             'address_2' => get_option('woocommerce_store_address_2', ''),
             'city' => get_option('woocommerce_store_city', ''),
@@ -125,7 +130,7 @@ class StoreSettingsProvider {
             'thousand_separator' => get_option('woocommerce_price_thousand_sep', ','),
             'decimal_separator' => get_option('woocommerce_price_decimal_sep', '.'),
             'number_of_decimals' => (int) get_option('woocommerce_price_num_decimals', 2),
-            'timezone' => get_option('timezone_string', 'UTC'),
+            'timezone' => get_option('timezone_string', 'UTC') ?: 'UTC',
             'weight_unit' => get_option('woocommerce_weight_unit', 'kg'),
             'dimension_unit' => get_option('woocommerce_dimension_unit', 'cm'),
         ];