groups template improved