Issue #524: Improve user groups
Moved the custom code from the Groups homepage into a reusable macro