updated the templates and view