Added handling for 2 other infographic elements (with code generic for
most others). Refactored infrographic generation code