Fixes #4507: Add UI for group composition