Modified tempalte and view