removed todos by moving hardcoded strings to strings.xml