gh-1 Add grids to layout