Modifying some templates and adding some new ones