diff --git a/src/config/onboarding.py b/src/config/onboarding.py
index 1df0f9b6..5997984f 100644
--- a/src/config/onboarding.py
+++ b/src/config/onboarding.py
@@ -38,22 +38,26 @@ def set_config_from_onboarding(config_settings: OnboardingConfig):
 
     get = _get_val_or_none
 
+    config.reload()
+
     if get(config_settings, 'stateTarget') or not get(config_settings,
-                                                      'networkContribution'):
+                                                      'networkContrib'):
         config.set('general.security_level', 1)
 
     config.set('ui.theme', 'light')
     if get(config_settings, 'useDark'):
         config.set('ui.theme', 'dark')
 
-    if not get(config_settings,
-               'useCircles') or config.get('general.security_level') > 0:
-        config.set('plugins.disabled',
-                   config.get('plugins.disabled', []).append('flow'))
+    disabled = config.get('plugins.disabled', [])
 
-    if not get(config_settings, 'useMail'):
-        config.set('plugins.disabled',
-                   config.get('plugins.disabled', []).append('pms'))
+    if not get(config_settings, 'circles') or \
+            config.get('general.security_level') > 0:
+        disabled.append('flow')
+
+    if not get(config_settings, 'mail'):
+        disabled.append('pms')
+
+    config.set('plugins.disabled', disabled)
 
     config.set('general.store_plaintext_blocks',
                get(config_settings, 'plainContrib'))
diff --git a/src/etc/onionrvalues.py b/src/etc/onionrvalues.py
index 3348a3e7..6db86b4b 100755
--- a/src/etc/onionrvalues.py
+++ b/src/etc/onionrvalues.py
@@ -53,7 +53,7 @@ MAX_NEW_PEER_QUEUE = 1000
 """Make announce take a few seconds (on average) to compute to discourage excessive node announcements"""
 ANNOUNCE_POW = 6
 """30 days is plenty of time for someone to decide to renew a block"""
-DEFAULT_EXPIRE = 300
+DEFAULT_EXPIRE = 2592000
 # Metadata header section length limits, in bytes
 BLOCK_METADATA_LENGTHS = {'meta': 1000, 'sig': 200, 'signer': 200, 'time': 10, 'pow': 1000, 'encryptType': 4, 'expire': 14}
 
diff --git a/static-data/default_config.json b/static-data/default_config.json
index 58a67151..a2d42e3b 100755
--- a/static-data/default_config.json
+++ b/static-data/default_config.json
@@ -35,7 +35,7 @@
         "verbosity": "default"
     },
     "onboarding": {
-        "done": true
+        "done": false
     },
     "peers": {
         "max_connect": 1000,
@@ -43,8 +43,8 @@
         "minimum_score": -100
     },
     "plugins": {
-        "disabled": {},
-        "enabled": {}
+        "disabled": [],
+        "enabled": []
     },
     "timers": {
         "getBlocks": 10,
diff --git a/static-data/www/onboarding/index.html b/static-data/www/onboarding/index.html
index 5e01eda5..276b0cb0 100644
--- a/static-data/www/onboarding/index.html
+++ b/static-data/www/onboarding/index.html
@@ -61,7 +61,6 @@
                 </div>
             </div>
         </div>
-        </div>
     </section>
 
     <br>
@@ -78,49 +77,54 @@
         </div>
     </div>
 
-    <div class="onboarding">
-        <noscript><h1>Unfortunately, this requires JavaScript. Don't worry, all scripts are open source and locally loaded.</h1></noscript>
-        <p>Welcome. There are just a few questions for you to answer before you get started.</p>
-        <br>
-        <form method='post' id="onboardingForm">
-            <div class="field">
-                <div>
-                    I am concerned about the following targeting me...
-                </div>
-                <i class="icon fas fa-eye"></i> <input type="checkbox" name="state" checked> <label for="state">Government (mass surveillance)</label>
+    <div class="columns">
+        <div class="column">
+            <div class="onboarding">
+                <noscript><h1>Unfortunately, this requires JavaScript. Don't worry, all scripts are open source and locally loaded.</h1></noscript>
+                <p>Welcome. There are just a few questions for you to answer before you get started.</p>
                 <br>
-                <i class="icon fas fa-university"></i> <input type="checkbox" name="stateTarget"> <label for="stateTarget">Government (direct target)</label>
-                <br>
-                <i class="icon fas fa-binoculars"></i> <input type="checkbox" name="local"> <label for="local">Nearby threat</label>
-            </div>
-            <div class="field">
-                <div>
-                    I want to contribute to Onionr by...
-                </div>
-                <i class="icon fas fa-network-wired"></i> <input checked type="checkbox" name="networkContribution"> <label for="networkContribution">Participating in data storage & sharing</label>
-                <br>
-                <i class="icon fas fa-book-open"></i> <input checked type="checkbox" name="networkContributionPlain"> <label for="networkContributionPlain">Storing plaintext data</label>
-                <br>
-                <i class="icon fas fa-dollar-sign"></i> <input type="checkbox" name="donate"> <label for="donate">Donating the price of a coffee to fund development</label>
-            </div>
-            <div class="field">
-                <div>
-                    I want to...
-                </div>
-                <i class="icon fas fa-user"></i> <input type="checkbox" name="useDeterministic"> <label for="useDeterministic">Use a seed to re(generate) a user ID</label>
-                <br>
-                <i class="icon fas fa-envelope"></i> <input type="checkbox" name="useMail" checked> <label for="useMail">Use OnionrMail</label>
-                <br>
-                <i class="icon fas fa-comments"></i> <input type="checkbox" name="useCircles" checked> <label for="useMail">Use Circles (message board system)</label>
-                <br>
-                <i class="icon fas fa-palette"></i> <input type="checkbox" name="useDarkTheme" checked> <label for="useDark">Use Dark Theme</label>
+                <form method='post' id="onboardingForm">
+                    <div class="field">
+                        <div>
+                            I am concerned about the following targeting me...
+                        </div>
+                        <i class="icon fas fa-eye"></i> <input type="checkbox" name="state" checked> <label for="state">Government (mass surveillance)</label>
+                        <br>
+                        <i class="icon fas fa-university"></i> <input type="checkbox" name="stateTarget"> <label for="stateTarget">Government (direct target)</label>
+                        <br>
+                        <i class="icon fas fa-binoculars"></i> <input type="checkbox" name="local"> <label for="local">Nearby threat</label>
+                    </div>
+                    <div class="field">
+                        <div>
+                            I want to contribute to Onionr by...
+                        </div>
+                        <i class="icon fas fa-network-wired"></i> <input checked type="checkbox" name="networkContribution"> <label for="networkContribution">Participating in data storage & sharing</label>
+                        <br>
+                        <i class="icon fas fa-book-open"></i> <input checked type="checkbox" name="networkContributionPlain"> <label for="networkContributionPlain">Storing plaintext data</label>
+                        <br>
+                        <i class="icon fas fa-dollar-sign"></i> <input type="checkbox" name="donate"> <label for="donate">Donating the price of a coffee to fund development</label>
+                    </div>
+                    <div class="field">
+                        <div>
+                            I want to...
+                        </div>
+                        <!--<i class="icon fas fa-user"></i> <input type="checkbox" name="useDeterministic"> <label for="useDeterministic">Use a seed to re(generate) a user ID</label>
+                        <br>
+                        -->
+                        <i class="icon fas fa-envelope"></i> <input type="checkbox" name="useMail" checked> <label for="useMail">Use OnionrMail</label>
+                        <br>
+                        <i class="icon fas fa-comments"></i> <input type="checkbox" name="useCircles" checked> <label for="useMail">Use Circles (message board system)</label>
+                        <br>
+                        <i class="icon fas fa-palette"></i> <input type="checkbox" name="useDarkTheme" checked> <label for="useDark">Use Dark Theme</label>
 
-                <br>
+                        <br>
+                    </div>
+                    <br>
+                    <input type="submit" value="Get Started" class="button is-primary">
+                    <br><br>
+                </form>
             </div>
-            <br>
-            <input type="submit" value="Get Started" class="button is-primary">
-            <br><br>
-        </form>
+        </div>
     </div>
 
 </body>
diff --git a/static-data/www/onboarding/onboarding.css b/static-data/www/onboarding/onboarding.css
index cb15c040..66c6c9c6 100644
--- a/static-data/www/onboarding/onboarding.css
+++ b/static-data/www/onboarding/onboarding.css
@@ -8,7 +8,7 @@ img{
 .onboarding{
     padding-left: 5%;
     text-align: justify;
-    font-size: 1.5em;
+    font-size: 1.8em;
 }
 
 .icon{
diff --git a/static-data/www/onboarding/onboarding.js b/static-data/www/onboarding/onboarding.js
index bde0f8b9..f5fa50c3 100644
--- a/static-data/www/onboarding/onboarding.js
+++ b/static-data/www/onboarding/onboarding.js
@@ -52,7 +52,7 @@ document.getElementById('onboardingForm').onsubmit = function(e){
     submitInfo.networkContrib = getCheckValue('networkContribution')
     submitInfo.plainContrib = getCheckValue('networkContributionPlain')
     submitInfo.donate = getCheckValue('donate')
-    submitInfo.deterministic = getCheckValue('useDeterministic')
+    //submitInfo.deterministic = getCheckValue('useDeterministic')
     submitInfo.mail = getCheckValue('useMail')
     submitInfo.circles = getCheckValue('useCircles')
     submitInfo.useDark = getCheckValue('useDarkTheme')
diff --git a/tests/runtime-result.txt b/tests/runtime-result.txt
index cae42e6a..4b1ecd35 100644
--- a/tests/runtime-result.txt
+++ b/tests/runtime-result.txt
@@ -1 +1 @@
-1580689731
\ No newline at end of file
+1580770843
\ No newline at end of file