Made changes to activities after Stephanie's code review

Still needs some small updates, but is okay for now