Add circle and rectangle