Top NavBar Menu refactoring.