Toasts improvements