Add Create New Group section, refactor