Fixessss
Merge pull request #110 from michaelyuan/chat-redesign

Fixessss