Broke activites into smaller components