Reorganize and Tweak Color Swatches UI