Updated header contents in templates
Moved log section to bottom of file