More work on New Window Wizard