Did some navigation stuff
Merge remote-tracking branch 'cs4911-team-yay/master'