Updated to draw grids and shadow