Minor changes

- Moved string resources to strings.xml
- Code cleanup