Cleaned up the button highlighting.