Made Activities match the CM almost exactly.