Main Activity update
Merge remote-tracking branch 'origin/john_bryant'