modified and added codes for new template
Merge branch 'develop' into staging