Improvements to the way labels are handled

Adds proper unit support by default, and options ot customise through
the dictionaries