Some tidying of sparklines
Broke out some sub-components for clarity