Fix button and color