Change event on Button refress + Improve