* Update button style
* Improve toast messages
