Some charts improvements