Improved labels and annotation placement.