Added nav and moved parts of the grid_framework so they could be reused