Fixed issue with template and the new header and footer includes.