Refactored group layouts