Reworked the buttons