Fix chat UI
Fix bug
Merge pull request #181 from zoic21/master

Merge from master