Improved Color Picker layout