Added some better toasts