Fix button label colors and refuctoring