Added ability to render choices versus numeric and numeric versus numeric graphs