Added a wrapper to fix #17

Also moved the function appending the headline back to the nav setup