Fixes #4391, Split group edit form into seperate parts
Merge pull request #6139 from jeabakker/4391-split-group-edit-form

Split the group edit form into seperate parts for extendability