Added new template and views