Added the info button in all the xml, unhardcoded all the strings
Handled the merge conflicts, xml coding