some changes on the templates