New format for NavBar and links