diff --git a/src/qml/components/AboutOptions.qml b/src/qml/components/AboutOptions.qml
index e20adf9609..7119ca49ba 100644
--- a/src/qml/components/AboutOptions.qml
+++ b/src/qml/components/AboutOptions.qml
@@ -51,7 +51,8 @@ ColumnLayout {
         header: qsTr("Version")
         actionItem: ExternalLink {
             parentState: versionLink.state
-            description: nodeModel.fullClientVersion
+            // description: nodeModel.fullClientVersion
+            description: optionsModel.fullClientVersion
             link: "https://bitcoin.org/en/download"
             iconSource: "image://images/caret-right"
             iconWidth: 18
diff --git a/src/qml/components/StorageLocations.qml b/src/qml/components/StorageLocations.qml
index acaa69b40a..d91a271703 100644
--- a/src/qml/components/StorageLocations.qml
+++ b/src/qml/components/StorageLocations.qml
@@ -22,11 +22,21 @@ ColumnLayout {
         ButtonGroup.group: group
         text: qsTr("Default")
         description: qsTr("Your application directory.")
-        customDir: optionsModel.getDefaultDataDirString
-        checked: optionsModel.dataDir === optionsModel.getDefaultDataDirString
+        checked: true
+        customDir: updateCustomDir()
+        function updateCustomDir() {
+            if (checked) {
+                optionsModel.dataDir = optionsModel.getDefaultDataDirString;
+                optionsModel.defaultReset();
+                return optionsModel.dataDir;
+            } else {
+                return "";
+            }
+        }
         onClicked: {
             defaultDirOption.checked = true
             optionsModel.dataDir = optionsModel.getDefaultDataDirString
+            optionsModel.defaultReset()
         }
     }
     OptionButton {
diff --git a/src/qml/components/StorageOptions.qml b/src/qml/components/StorageOptions.qml
index eed962b951..0f8f1b7436 100644
--- a/src/qml/components/StorageOptions.qml
+++ b/src/qml/components/StorageOptions.qml
@@ -22,7 +22,8 @@ ColumnLayout {
         Layout.fillWidth: true
         ButtonGroup.group: group
         text: qsTr("Reduce storage")
-        description: qsTr("Uses about %1GB. For simple wallet use.").arg(chainModel.assumedChainstateSize + 2)
+        // description: qsTr("Uses about %1GB. For simple wallet use.").arg(chainModel.assumedChainstateSize + 2)
+        description: qsTr("Uses about %1GB. For simple wallet use.").arg(optionsModel.assumedChainstateSize + 2)
         recommended: true
         checked: !root.customStorage && optionsModel.prune
         onClicked: {
@@ -39,8 +40,10 @@ ColumnLayout {
         ButtonGroup.group: group
         text: qsTr("Store all data")
         checked: !optionsModel.prune
+        // description: qsTr("Uses about %1GB. Support the network.").arg(
+        //     chainModel.assumedBlockchainSize + chainModel.assumedChainstateSize)
         description: qsTr("Uses about %1GB. Support the network.").arg(
-            chainModel.assumedBlockchainSize + chainModel.assumedChainstateSize)
+            optionsModel.assumedBlockchainSize + optionsModel.assumedChainstateSize)
         onClicked: {
             optionsModel.prune = false
         }
diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml
index 471fe127c0..b1361f0bcb 100644
--- a/src/qml/pages/main.qml
+++ b/src/qml/pages/main.qml
@@ -49,14 +49,14 @@ ApplicationWindow {
         focus: true
         Keys.onReleased: {
             if (event.key == Qt.Key_Back) {
-                nodeModel.requestShutdown()
+                optionsModel.requestShutdown()
                 event.accepted = true
             }
         }
     }
 
     Connections {
-        target: nodeModel
+        target: optionsModel
         function onRequestedShutdown() {
             main.clear()
             main.push(shutdown)
@@ -78,6 +78,7 @@ ApplicationWindow {
             OnboardingConnection {}
 
             onFinishedChanged: {
+                optionsModel.onboardingFinished()
                 optionsModel.onboard()
                 if (AppMode.walletEnabled && AppMode.isDesktop) {
                     main.push(desktopWallets)
diff --git a/src/qml/pages/onboarding/OnboardingStorageLocation.qml b/src/qml/pages/onboarding/OnboardingStorageLocation.qml
index b2c3aa1e00..ebfccce030 100644
--- a/src/qml/pages/onboarding/OnboardingStorageLocation.qml
+++ b/src/qml/pages/onboarding/OnboardingStorageLocation.qml
@@ -19,7 +19,8 @@ InformationPage {
     bold: true
     headerText: qsTr("Storage location")
     headerMargin: 0
-    description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of %1GB of storage.").arg(chainModel.assumedChainstateSize + 1)
+    // description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of %1GB of storage.").arg(chainModel.assumedChainstateSize + 1)
+    description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of %1GB of storage.").arg(optionsModel.assumedChainstateSize + 1)
     descriptionMargin: 20
     detailActive: true
     detailItem: StorageLocations {}