Add descriptions in template view
Merge branch 'master' into anna