Improve grouping of candidates per row
Clean up