Streams/chat - fixed use of templates
Major refactoring of Streams/chat for Vlad