Fix highlight bug, add another chart