Refactor Wizard and WizardView to be more immutable and injectable