ChatButton and other improvements