Re-designed with new template.
Merge branch 'develop'