Budget charts - clean up and bug fix