Fixed the button highlights