Button color fixes