modified some layout and string xmls to avoid hard-coding text