Sorted out headers and navs