CRM-15226 - label improvements.

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