Fix ColorSelectorPopup layout
Fix ColorSelectorPopup.