Modified views, templates and added models