Improving Toast messages, #72