Even more updates to group layout