Some strings moved to strings.xml