Schedule optimized and layout tweak on color picker