Improve Web Setup Wizard