clean up layouts, score grouping working again