Improve stop button.