Improved group layout