Merged expedition code into one controller, added navigation logic for setting active links