Few more tweaks on charts