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