Move more hard coded strings to xml