change event done, fix UI