Add and refactor site navigation