AUI-1247 Improve ColorPicker alignment