refactor navbar final3