added grid, more classes