modified viewKpiForm and use it in newTeamForm. Cleaning needed