minor navbar refactor