Some header and template updates