updated some templates according to the requests