refactored and created wizard template