Improved circle markers as well