chat layout
Merge origin/master
chat layout 1