Updated reaction to button press, general clean-up