Added links to top nav
Merge branch 'my'