Tweaks to UI on setup pages
Next now starts soscribe