Made string and layout changes

Made changes to the strings and the layouts in the activity files. Made
changes to make the layout more consistent and meaningful. Still
recovering from revert mistakes.