Some changes in grid and draw objects