more experimental header cleanup
fix navlinks