added body
added nav
Merge branch 'editingNavigation'