Application - Draw: Picker performance improvments