Update to use pure css grid