More modules, grid improved
Better performance of grid