Updated group layout