Added grids and notices