more fixes for barcode layout CRM-12967
Merge pull request #1159 from kurund/CRM-12965

more fixes for barcode layout CRM-12967