diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 05684ba8..c369af42 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -227,7 +227,7 @@ DrawerType {
                     visible: ExportController.qrCodesCount > 0
 
                     horizontalAlignment: Text.AlignHCenter
-                    text: qsTr("To read the QR code in the Amnezia app, select \"Add Server\" → \"I have connection details\"")
+                    text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 7273b86d..b53fdfdf 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -103,6 +103,7 @@ PageType {
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index fb2258c5..659193ca 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -134,6 +134,7 @@ PageType {
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 7b78bc07..fe0ef8c3 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -89,6 +89,7 @@ PageType {
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index 9ff99193..15c5e531 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -89,13 +89,15 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Clear cached profiles?")
-                    questionDrawer.descriptionText = qsTr("some description")
+                    questionDrawer.descriptionText = qsTr("")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
                     questionDrawer.yesButtonFunction = function() {
                         questionDrawer.visible = false
-                        ContainersModel.clearCachedProfiles()
+                        PageController.showBusyIndicator(true)
+                        SettingsController.clearCachedProfiles()
+                        PageController.showBusyIndicator(false)
                     }
                     questionDrawer.noButtonFunction = function() {
                         questionDrawer.visible = false
@@ -165,7 +167,7 @@ PageType {
 
                 clickedFunction: function() {
                     questionDrawer.headerText = qsTr("Clear server from Amnezia software?")
-                    questionDrawer.descriptionText = qsTr(" All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
+                    questionDrawer.descriptionText = qsTr("All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index f0155667..45aad9d0 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -49,7 +49,7 @@ PageType {
 
                 headerText: qsTr("Server connection")
                 descriptionText: qsTr("Do not use connection code from public sources. It may have been created to intercept your data.\n
-It's okay if a friend passed the code.")
+It's okay as long as it's from someone you trust.")
             }
 
             Header2TextType {
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index 5187a6e3..d089a70d 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -107,31 +107,6 @@ PageType {
                     goToPage(PageEnum.PageSetupWizardEasy)
                 }
             }
-
-//            BasicButtonType {
-//                Layout.fillWidth: true
-//                Layout.topMargin: -8
-
-//                defaultColor: "transparent"
-//                hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-//                pressedColor: Qt.rgba(1, 1, 1, 0.12)
-//                disabledColor: "#878B91"
-//                textColor: "#D7D8DB"
-//                borderWidth: 1
-
-//                text: qsTr("Select protocol to install")
-
-//                onClicked: function() {
-//                    if (!isCredentialsFilled()) {
-//                        return
-//                    }
-
-//                    InstallController.setShouldCreateServer(true)
-//                    InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
-
-//                    goToPage(PageEnum.PageSetupWizardProtocols)
-//                }
-//            }
         }
     }
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index f2600f65..375a8332 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -45,7 +45,7 @@ PageType {
         id: fl
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + continueButton.anchors.bottomMargin
+        contentHeight: content.implicitHeight + setupLaterButton.anchors.bottomMargin
 
         Column {
             id: content
@@ -126,7 +126,9 @@ PageType {
                 }
             }
 
-            DividerType {}
+            DividerType {
+                implicitWidth: parent.width
+            }
 
             CardType {
                 implicitWidth: parent.width
@@ -141,6 +143,11 @@ PageType {
                 }
             }
 
+            Item {
+                implicitWidth: 1
+                implicitHeight: 1
+            }
+
             BasicButtonType {
                 id: continueButton
 
@@ -163,6 +170,8 @@ PageType {
             }
 
             BasicButtonType {
+                id: setupLaterButton
+
                 implicitWidth: parent.width
                 anchors.topMargin: 8
                 anchors.bottomMargin: 24
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 2f5ed569..d64fa097 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -212,6 +212,7 @@ PageType {
 
                             headerText: qsTr("Port")
                             textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
                         }
 
                         Rectangle {