Improve wizard for registration process