Rectangle annotate improvements