Fix problems with point labels

There were misplaced and alignments were not considered. Should be better now.