Folder Wizard UI clean up

Input from Jan