Redesign wizard forms