clean up landing page.
Merge branch 'master' into dev-homepage
Changed nav on landing.
changed nav