diff --git a/gui/packages/ubuntupro/lib/l10n/app_en.arb b/gui/packages/ubuntupro/lib/l10n/app_en.arb
index f722bbfc9..eefe9c88b 100644
--- a/gui/packages/ubuntupro/lib/l10n/app_en.arb
+++ b/gui/packages/ubuntupro/lib/l10n/app_en.arb
@@ -53,7 +53,7 @@
     "purchaseStatusServer":"Something went wrong with Microsoft Store. Please try again later.",
     "purchaseStatusUnknown": "Unknown error when trying to purchase the subscription. Consider restarting this app.",
 
-    "landscapeHeading": "You can manage your Ubuntu instances remotely with {landscapeLink}.\n\nConfigure the connection to Landscape:",
+    "landscapeHeading": "Configure the connection to {landscapeLink} to manage your Ubuntu WSL instances remotely.",
     "@landscapeHeading": {
         "placeholders": {
             "landscapeLink": {
@@ -61,9 +61,9 @@
             }
         }
     },
-    "landscapeQuickSetupSaas": "Quick Setup (SaaS)",
+    "landscapeQuickSetupSaas": "Landscape SaaS configuration",
     "landscapeQuickSetupSaasHint": "Register with landscape.canonical.com",
-    "landscapeQuickSetupSelfHosted": "Quick Setup (Self-hosted)",
+    "landscapeQuickSetupSelfHosted": "Self-hosted Landscape configuration",
     "landscapeQuickSetupSelfHostedHint": "Register with your own Landscape server",
     "landscapeFQDNLabel": "Landscape server address",
     "landscapeFQDNError": "Invalid URI. Format should be a hostname or IP address.",
diff --git a/gui/packages/ubuntupro/lib/pages/landscape/landscape_page.dart b/gui/packages/ubuntupro/lib/pages/landscape/landscape_page.dart
index 03f6c80b3..0a89e36df 100644
--- a/gui/packages/ubuntupro/lib/pages/landscape/landscape_page.dart
+++ b/gui/packages/ubuntupro/lib/pages/landscape/landscape_page.dart
@@ -141,7 +141,7 @@ class LandscapeConfigForm extends StatelessWidget {
     final lang = AppLocalizations.of(context);
 
     return Padding(
-      padding: const EdgeInsets.symmetric(vertical: _kHeight),
+      padding: const EdgeInsets.symmetric(vertical: 2 * _kHeight),
       // The FocusTraversalGroup is necessary to keep the tab navigation order wed expect:
       // We ping-pong between the radio buttons and the form fields that belong to the selected radio button,
       // by assigning odd NumericFocusOrder() values to the radio buttons (on the left) and even values to the form fields,
@@ -158,17 +158,17 @@ class LandscapeConfigForm extends StatelessWidget {
               Flexible(
                 child: Column(
                   children: [
-                    FocusTraversalOrder(
-                      order: const NumericFocusOrder(0),
-                      child: _ConfigTypeRadio(
-                        value: LandscapeConfigType.saas,
-                        title: lang.landscapeQuickSetupSaas,
-                        subtitle: lang.landscapeQuickSetupSaasHint,
-                        groupValue: model.configType,
-                        onChanged:
-                            model.isSaaSSupported ? model.setConfigType : null,
+                    if (model.isSaaSSupported)
+                      FocusTraversalOrder(
+                        order: const NumericFocusOrder(0),
+                        child: _ConfigTypeRadio(
+                          value: LandscapeConfigType.saas,
+                          title: lang.landscapeQuickSetupSaas,
+                          subtitle: lang.landscapeQuickSetupSaasHint,
+                          groupValue: model.configType,
+                          onChanged: model.setConfigType,
+                        ),
                       ),
-                    ),
                     FocusTraversalOrder(
                       order: const NumericFocusOrder(2),
                       child: _ConfigTypeRadio(