Wizard initial commit
Some wizard adjustments