- Revisions to tempalte rendering and inclusion