Sorted out grid to work with nav