Updated grids to use angular