Product labels layout adjustments
Merge branch 'dev'