generator setup dialogs improved