SONATA-383 - Improve display of archive template

Fix
Merge pull request #158 from eko/master

SONATA-383 - Improve display of archive template