Updated to other chart lib and added some small changes