Improved drawing of annotation labels