Added some layout and grids