Improve down payment event handling