Updates and edits

Edited some new text, reconciled navigation with new home page.
Merge branch 'features/nav/edit' into feature/nav