refactor navbar final5