Added Teams, fixed render order