Layout tweaks and renaming of some activity menu titles
Merge remote-tracking branch 'origin/master'