Feature/24 edit teams