Issue #424 adding toast