Fixup commit to remove 2-level and to integrate New and "No set" options in single dialog