Cleanup and made cancel work for color picker