Create group layout

Title says all.
Revert "Create group layout"

This reverts commit a6f86ea6b53d4feb3d05cffdeee4b308a312aeaf.
Revert "Revert "Create group layout""

This reverts commit ffe2d324a289d6fbf0aef151cfb6f5b23705b9dc.