Added single template.
Add hero template
Fix conflict