Improved wizard interface.