Final - v2

Revised links on navbar to reflect proper links