Fix navbar links
Merge branch 'dev'