Better ordering of teams, some style changes