Polish up responsive and fix StopPour event