Refactoring setup wizard, new screenshots