CRM-14288 - Refactor and simplify relationship form