Made changes to the Wizard

Added and moved components on Wizard