Improved display of NavBar in TopMenu layout