Update draws of labels

Updated draw methods of labels to use html and css to clean up the JS
Merge remote-tracking branch 'origin/Development'