Improved display by grouping in 2 rows