updates in templates and views
updates in templates and views