Various changes to chat layout