More chart improvments