began refactoring of navbar