Update strings, move other hardcoded strings to values.xml