Add new parameter 'itemsPerRow'. This limits the grid columns used, 
making items move to the next row if overextending.

Also simplify component structure.