Yet more improvement to charts