CLC-1097 Completed label positioning
https://jira.media.berkeley.edu/jira/browse/CLC-1097
CLC-1097 Completed label positioning
https://jira.media.berkeley.edu/jira/browse/CLC-1097
Merge pull request #555 from shacker/CLC-1097

CLC-1097 Completed label positioning