Rectangle annotate improvements, added it to main form menu