Minor changes to XML and ChatFragment