merged team edit form into edit view