Improve button selector