simplify and fix color picker button