Fixed bugs with navigating via the menu.