Render nav bar on every page
Fix merge conflict