add Text and fix Ellipse