change headernav order and remove scrollspy
merge with master