CRM-12965, UI improvements