Final team formatting fixes