More XML/activity changes