Made the button highlighting a little less inelegant.