Refactor to use existing listeners for toasts