refactored Navbar submodule + added some unit tests