Fix a lot of interaction between the buttons and the display