Wizard UI Changes