Fix problems with the style of labels
Add some missing functions