Finished navbar refactoring