Redesign step form
Make sure we redirect to the first page after last step