Improve wizard experience