updated template and views