Updating the template and pages
Merge branch 'develop'