restructured and corrected content of subtemplate