added grid, basic layout