Reorganizing some activity items and adding ch2 activities