CRM-14367 - Replacing PR 2751 with additional UI and help changes.

----------------------------------------
* CRM-14367:
  https://issues.civicrm.org/jira/browse/CRM-14367