Add CircleMarker and clean-up Circle