21 refactor navbar