Add main nav pages
Merge branch 'main_pages' with 'development', fixing merge conflicts