Removed hard-coded strings from xml files