Navbar module refactoring