Enhancing team add/remove

Making a more fluid experience while everyone is on vacation and can't
argue. :)  Will adjust as needed once folks are back.