Some changes in the grid system