Chat history
chat history styling / controls
Merge remote-tracking branch 'origin/master'