Minor cosmetic changes
Moved strings in code back to strings.xml