Removed hard-coded strings into Strings.xml and Constants