Updates and fixes on templates