CMS-1434 Content Form - Adjustments to Image picker and relationship picker