Work on first time wizard design