updated links on navbar to actually connect
Merge branch 'master' into update_nav