Improved quote screen phase 2