Updated layout and added grids