Refactorings in wizard components
Merge pull request #630 from sschaef/t-wizards-refactoring

Refactorings in wizard components