various fixes to color picker