Fix z-index of grids - #373