refactor, add link to navbar