Resolved the x-axis offset issue
Now using contestants for most values
Added icons