Share form between new modal and settings
Implement full new/save support for cohorts