updates and fixes some of nunjucks email and layout templates