CRM-12965, UI improvements
CRM-12967, barcode position fixes
Merge pull request #1142 from kurund/CRM-12967

CRM-12967, barcode position fixes
Merge pull request #1143 from kurund/CRM-12965

CRM-12965, UI improvements