updated templates and views