Grid columns now need to be direct children to grid container

I'm not good with cherry picking, so this file got lost on the way