Add / Edit card refactored to work with re-join.