#73 Improved performance of the button.