Tidy up the team management screen