Added templates and views