Fixed some color issues on buttons