Improvements to color picker