Reclean up nav markup, having resimplified