Clean up series labelling
Add series component to all content types