pushing Sam's updates for fragments and xml files.