more cleanup and layout fixes CRM-12965
added formRule to prevent conflict between barcode and #4, CRM-12965
Merge pull request #1152 from kurund/CRM-12965

CRM-12965