js chart styling
more chart js styling
fixed index merge conflict