fix links in nav header
refactor a bit