Making progress. Corrected some more hardcoded strings. Added a new activity.
Merge remote-tracking branch 'origin/master'