Charts: Improve button selection