Moving sparkline x axis formatting over to entity.
Fixing merge conflicts.