Refactored add/remove for rows.