refactor navbar final2