Update map. Add pages. Pull nav out to include. Add nav on all pages.
Resolve merge conflict
Fix merge conflict