Update to menu bar

Updated navigation, fixed pages.