Improving how toasts are created, part of #205