Made changes to the about activity and email input activity.
Resolved merge conflicts. Cleaned up the code for readability.