Made some changes to the templates.