navbar refactor