Fix up collection view grid