Change menu and navigation to handle new menu layout