Replaced add/remove buttons.