imporve design of chat.jade
Merge Conflict