Updated the templates and views