chat window formatting
Merge origin/master