Moved the grid into a directive