Add circles and rectangles