added grid, some layout elements