New Changes to xml files and main activities