chat ui bad
ui fix
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  change shape