UI improvement - Wizard developed