diff --git a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp
index 2847d2b..d080e02 100644
--- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp
+++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp
@@ -150,8 +150,8 @@ SBColumnInfo g_ColumnInfo[NUM_COLUMNS] =
 	{"#SCORE",		40,			Label::a_east},     // score
     {"#KILLS",      40,         Label::a_east},     // kills
 	{"#DEATHS",		40,			Label::a_east},     // deaths
-	{"#LATENCY",	40,			Label::a_east},     // ping
 	{NULL,			40,			Label::a_east},     // resources
+	{"#LATENCY",	40,			Label::a_east},     // ping
 	{"#VOICE",		40,			Label::a_east},     
 	{NULL,			2,			Label::a_east},		// blank column to take up the slack
 };
@@ -1252,7 +1252,7 @@ void ScorePanel::FillGrid()
 					if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT )
                     {
 						if ( isNsMode ) {
-							if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE )  {
+							if ( theExtraPlayerInfo->teamnumber == TEAM_ONE || theExtraPlayerInfo->teamnumber == TEAM_THREE )  {
 								int r=CVAR_GET_FLOAT("cl_iconr");
 								int g=CVAR_GET_FLOAT("cl_icong");
 								int b=CVAR_GET_FLOAT("cl_iconb");
@@ -1285,7 +1285,7 @@ void ScorePanel::FillGrid()
 									break;
 								}
 							}
-							else if ( gHUD.GetHUDTeam() == TEAM_TWO || gHUD.GetHUDTeam() == TEAM_FOUR ) {
+							else if ( theExtraPlayerInfo->teamnumber == TEAM_TWO || theExtraPlayerInfo->teamnumber == TEAM_FOUR ) {
 								sprintf(sz, "%d", theExtraPlayerInfo->extra);
 							}
 						}
diff --git a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
index 1b40e17..c6f9e52 100644
--- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
+++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
@@ -23,8 +23,8 @@
 #define COLUMN_SCORE        4
 #define COLUMN_KILLS        5
 #define COLUMN_DEATHS		6
-#define COLUMN_LATENCY		7
-#define COLUMN_EXTRA	    8
+#define COLUMN_EXTRA	    7
+#define COLUMN_LATENCY		8
 #define COLUMN_VOICE		9
 #define COLUMN_BLANK		10
 #define NUM_COLUMNS			11