Fixed the template structure and content