refactor navbar final