updated different templates and views