UX improvements to Wizard