It would make sense to have the mapping of custom fields as a section on the Manage Custom Fields page instead of its own top level page.