Improve Rect and Oval Tools