Made infographics more modular
Merge branch 'modular'