Made near final changes to the template.