Improve FolderWizard