Added fixed circle and rectangle options