Refactor navbar tags