Eng 7060

This has been taken care with new template.html file