Fixed the drawing of circles and lines