Recover template changings
Merge pull request #94 from kudos-web/Roy

Recover template changings