CRM-12965, UI improvements
Merge pull request #1143 from kurund/CRM-12965

CRM-12965, UI improvements