Updated layout with grids