Fixing templates to have properly formatted header