Bugfixed Wizard

Fixed & conditionals in wizard