Added rectangle editor
Changed code order
Added ellipse editor