Fixed groups editing