diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index 536c287ae5..f02c44709a 100644
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -647,20 +647,20 @@ static const Style g_Style_Pump_HalfDouble =
 	6,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*2.58f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_4,	+PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_5,	+PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*2.58f, NULL },
-		},
+			{ TRACK_1,	-PUMP_COL_SPACING*2.5f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*1.5f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*0.5f-4, NULL },
+			{ TRACK_4,	+PUMP_COL_SPACING*0.5f+4, NULL },
+			{ TRACK_5,	+PUMP_COL_SPACING*1.5f+4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*2.5f+4, NULL },
+		}
 		{	// PLAYER_2
-			{ TRACK_1,	-PUMP_COL_SPACING*2.58f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_4,	+PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_5,	+PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*2.58f, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*2.5f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*1.5f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*0.5f-4, NULL },
+			{ TRACK_4,	+PUMP_COL_SPACING*0.5f+4, NULL },
+			{ TRACK_5,	+PUMP_COL_SPACING*1.5f+4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*2.5f+4, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -687,28 +687,28 @@ static const Style g_Style_Pump_Double =
 	10,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*4.58f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.58f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.58f, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.58f, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.58f, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.58f, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.5f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.5f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.5f-4, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.5f-4, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.5f-4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.5f+4, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.5f+4, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.5f+4, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.5f+4, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.5f+4, NULL },
 		},
 		{	// PLAYER_2
-			{ TRACK_1,	-PUMP_COL_SPACING*4.58f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.58f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.58f, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.58f, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.58f, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.58f, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.58f, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.58f, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.5f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.5f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.5f-4, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.5f-4, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.5f-4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.5f+4, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.5f+4, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.5f+4, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.5f+4, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.5f+4, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -773,17 +773,17 @@ static const Style g_Style_Pump_Couple_Edit =
 	10,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*5.0f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*4.0f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*3.0f, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*2.0f, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*1.0f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*1.0f, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*2.0f, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*3.0f, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*4.0f, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*5.0f, NULL },
-		},
+			{ TRACK_1,	-PUMP_COL_SPACING*5.0f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*4.0f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*3.0f-4, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*2.0f-4, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*1.0f-4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*1.0f+4, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*2.0f+4, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*3.0f+4, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*4.0f+4, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*5.0f+4, NULL },
+		}
 		{	// PLAYER_2
 			{ TRACK_1,	-PUMP_COL_SPACING*2.0f, NULL },
 			{ TRACK_2,	-PUMP_COL_SPACING*1.0f, NULL },
@@ -816,28 +816,28 @@ static const Style g_Style_Pump_Routine =
 	10,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
-			{ TRACK_1,	-PUMP_COL_SPACING*4.6f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.6f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.6f, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.6f, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.6f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.6f, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.6f, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.6f, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.6f, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.6f, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.6f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.6f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.6f-4, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.6f-4, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.6f-4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.6f+4, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.6f+4, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.6f+4, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.6f+4, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.6f+4, NULL },
 		},
 		{	// PLAYER_2
-			{ TRACK_1,	-PUMP_COL_SPACING*4.6f, NULL },
-			{ TRACK_2,	-PUMP_COL_SPACING*3.6f, NULL },
-			{ TRACK_3,	-PUMP_COL_SPACING*2.6f, NULL },
-			{ TRACK_4,	-PUMP_COL_SPACING*1.6f, NULL },
-			{ TRACK_5,	-PUMP_COL_SPACING*0.6f, NULL },
-			{ TRACK_6,	+PUMP_COL_SPACING*0.6f, NULL },
-			{ TRACK_7,	+PUMP_COL_SPACING*1.6f, NULL },
-			{ TRACK_8,	+PUMP_COL_SPACING*2.6f, NULL },
-			{ TRACK_9,	+PUMP_COL_SPACING*3.6f, NULL },
-			{ TRACK_10,	+PUMP_COL_SPACING*4.6f, NULL },
+			{ TRACK_1,	-PUMP_COL_SPACING*4.6f-4, NULL },
+			{ TRACK_2,	-PUMP_COL_SPACING*3.6f-4, NULL },
+			{ TRACK_3,	-PUMP_COL_SPACING*2.6f-4, NULL },
+			{ TRACK_4,	-PUMP_COL_SPACING*1.6f-4, NULL },
+			{ TRACK_5,	-PUMP_COL_SPACING*0.6f-4, NULL },
+			{ TRACK_6,	+PUMP_COL_SPACING*0.6f+4, NULL },
+			{ TRACK_7,	+PUMP_COL_SPACING*1.6f+4, NULL },
+			{ TRACK_8,	+PUMP_COL_SPACING*2.6f+4, NULL },
+			{ TRACK_9,	+PUMP_COL_SPACING*3.6f+4, NULL },
+			{ TRACK_10,	+PUMP_COL_SPACING*4.6f+4, NULL },
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]