buttons of the removal corrected
Merge branch 'remove-person-team' into nightly