Updates chat logic and UI

Test of pull request.