Feature/navbar

This pull request updates the navbar links as described in issue #378.