Amend width calculation for wide characters
Unicode fix for label
Cleanup style and null check
Merge branch 'hlaw-unicodefix'