Modularise chart components
Fix chart labels