diff --git a/plugins/main/src/main/res/xml/pref_overview.xml b/plugins/main/src/main/res/xml/pref_overview.xml
index f12a51150d..4e8498cf49 100644
--- a/plugins/main/src/main/res/xml/pref_overview.xml
+++ b/plugins/main/src/main/res/xml/pref_overview.xml
@@ -469,41 +469,41 @@
 
         </androidx.preference.PreferenceScreen>
 
+        <info.nightscout.core.validators.ValidatingEditTextPreference
+            android:defaultValue="100"
+            android:dialogMessage="@string/deliverpartofboluswizard"
+            android:inputType="number"
+            android:key="@string/key_boluswizard_percentage"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/partialboluswizard"
+            validate:maxNumber="100"
+            validate:minNumber="10"
+            validate:testType="numericRange" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_usebolusadvisor"
+            android:summary="@string/enable_bolus_advisor_summary"
+            android:title="@string/enable_bolus_advisor" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_usebolusreminder"
+            android:summary="@string/enablebolusreminder_summary"
+            android:title="@string/enablebolusreminder" />
+
         <androidx.preference.PreferenceScreen
             android:key="overview_advanced"
             android:title="@string/advancedsettings_title">
 
-            <info.nightscout.core.validators.ValidatingEditTextPreference
-                android:defaultValue="100"
-                android:dialogMessage="@string/deliverpartofboluswizard"
-                android:inputType="number"
-                android:key="@string/key_boluswizard_percentage"
-                android:maxLines="1"
-                android:selectAllOnFocus="true"
-                android:singleLine="true"
-                android:title="@string/partialboluswizard"
-                validate:maxNumber="100"
-                validate:minNumber="10"
-                validate:testType="numericRange" />
-
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_usebolusadvisor"
-                android:summary="@string/enable_bolus_advisor_summary"
-                android:title="@string/enable_bolus_advisor" />
-
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="@string/key_usesuperbolus"
                 android:summary="@string/enablesuperbolus_summary"
                 android:title="@string/enablesuperbolus" />
 
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_usebolusreminder"
-                android:summary="@string/enablebolusreminder_summary"
-                android:title="@string/enablebolusreminder" />
-
         </androidx.preference.PreferenceScreen>
 
     </PreferenceCategory>
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
index 421c9b13fe..278a14f35d 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
@@ -129,7 +129,7 @@ class WizardDialog : DaggerDialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         this.arguments?.let { bundle ->
             carbsPassedIntoWizard = bundle.getDouble("carbs_input")
-            notesPassedIntoWizard = bundle.getString("notes_input").toString()
+            notesPassedIntoWizard = bundle.getString("notes_input") ?: ""
         }
 
         dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)