fixed template structure
fixing template structure