updating some nav-main links
updating some footer links
Merge branch 'pr/22' into prod