diff --git a/JA2.suo b/JA2.suo
index 385cf759..489685e3 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp
index 9ce7bc67..b7ff0f6f 100644
--- a/Laptop/BobbyRGuns.cpp
+++ b/Laptop/BobbyRGuns.cpp
@@ -138,16 +138,16 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
 // WANNE
 #define		FILTER_BUTTONS_GUN_START_X				BOBBYR_PREVIOUS_BUTTON_X
 #define		FILTER_BUTTONS_AMMO_START_X				FILTER_BUTTONS_GUN_START_X
-#define		FILTER_BUTTONS_USED_START_X				FILTER_BUTTONS_GUN_START_X + 122
+#define		FILTER_BUTTONS_USED_START_X				FILTER_BUTTONS_GUN_START_X	//FILTER_BUTTONS_GUN_START_X + 122
 #define		FILTER_BUTTONS_Y						BOBBYR_PREVIOUS_BUTTON_Y + 25
 
 // WANNE
 // The number of filter buttons which category uses
 #define		NUMBER_GUNS_FILTER_BUTTONS			9
-#define		NUMBER_AMMO_FILTER_BUTTONS			9
+#define		NUMBER_AMMO_FILTER_BUTTONS			8
 #define		NUMBER_ARMOUR_FILTER_BUTTONS		1
 #define		NUMBER_MISC_FILTER_BUTTONS			1
-#define		NUMBER_USED_FILTER_BUTTONS			4
+#define		NUMBER_USED_FILTER_BUTTONS			3
 
 // WANNE
 #define		BOBBYR_GUNS_FILTER_BUTTON_GAP			BOBBYR_CATALOGUE_BUTTON_GAP - 1
@@ -186,7 +186,7 @@ INT8			ubFilterGunsButtonValues[] = {
 
 // WANNE
 INT8			ubFilterAmmoButtonValues[] = {
-							BOBBYR_FILTER_AMMO_HEAVY,
+							//BOBBYR_FILTER_AMMO_HEAVY,
 							BOBBYR_FILTER_AMMO_PISTOL,
 							BOBBYR_FILTER_AMMO_M_PISTOL,
 							BOBBYR_FILTER_AMMO_SMG,
@@ -198,7 +198,7 @@ INT8			ubFilterAmmoButtonValues[] = {
 
 INT8			ubFilterUsedButtonValues[] = {
 							BOBBYR_FILTER_USED_GUNS,
-							BOBBYR_FILTER_USED_AMMO,
+							//BOBBYR_FILTER_USED_AMMO,
 							BOBBYR_FILTER_USED_ARMOR,
 							BOBBYR_FILTER_USED_MISC};
 
@@ -538,7 +538,7 @@ BOOLEAN InitBobbyRAmmoFilterBar()
 		}
 
 		// Filter buttons
-		guiBobbyRFilterAmmo[i] = CreateIconAndTextButton( guiBobbyRFilterImage, BobbyRFilter[BOBBYR_FILTER_AMMO_HEAVY+i], BOBBYR_GUNS_BUTTON_FONT, 
+		guiBobbyRFilterAmmo[i] = CreateIconAndTextButton( guiBobbyRFilterImage, BobbyRFilter[BOBBYR_FILTER_AMMO_PISTOL+i], BOBBYR_GUNS_BUTTON_FONT, 
 													BOBBYR_GUNS_TEXT_COLOR_ON, BOBBYR_GUNS_SHADOW_COLOR, 
 													BOBBYR_GUNS_TEXT_COLOR_OFF, BOBBYR_GUNS_SHADOW_COLOR, 
 													TEXT_CJUSTIFIED, 
@@ -919,9 +919,9 @@ void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason)
 		
 		switch (bNewValue)
 		{
-			case BOBBYR_FILTER_AMMO_HEAVY:
-				guiCurrentAmmoFilterMode = NOT_GUN;
-				break;
+			//case BOBBYR_FILTER_AMMO_HEAVY:
+			//	guiCurrentAmmoFilterMode = NOT_GUN;
+			//	break;
 			case BOBBYR_FILTER_AMMO_PISTOL:
 				guiCurrentAmmoFilterMode = GUN_PISTOL;
 				break;
@@ -990,9 +990,9 @@ void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason)
 			case BOBBYR_FILTER_USED_GUNS:
 				guiCurrentUsedFilterMode = IC_BOBBY_GUN;
 				break;
-			case BOBBYR_FILTER_USED_AMMO:
-				guiCurrentUsedFilterMode = IC_AMMO;
-				break;
+			//case BOBBYR_FILTER_USED_AMMO:
+			//	guiCurrentUsedFilterMode = IC_AMMO;
+			//	break;
 			case BOBBYR_FILTER_USED_ARMOR:
 				guiCurrentUsedFilterMode = IC_ARMOUR;
 				break;
@@ -2595,13 +2595,13 @@ void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton)
 		if (iNewButton > -1)
 		{
 			// Disable new Button
-			DisableButton(guiBobbyRFilterAmmo[iNewButton]);
+			DisableButton(guiBobbyRFilterAmmo[iNewButton - 1]);
 		}
 
 		if (iOldButton > -1)
 		{
 			// Enable old Button
-			EnableButton(guiBobbyRFilterAmmo[iOldButton]);
+			EnableButton(guiBobbyRFilterAmmo[iOldButton - 1]);
 		}
 	}
 }
diff --git a/Utils/Text.h b/Utils/Text.h
index 8ede085a..555b3395 100644
--- a/Utils/Text.h
+++ b/Utils/Text.h
@@ -760,7 +760,7 @@ enum
 	BOBBYR_FILTER_GUNS_LMG,
 	BOBBYR_FILTER_GUNS_SHOTGUN,
 	// Ammo
-	BOBBYR_FILTER_AMMO_HEAVY,
+	//BOBBYR_FILTER_AMMO_HEAVY,
 	BOBBYR_FILTER_AMMO_PISTOL,
 	BOBBYR_FILTER_AMMO_M_PISTOL,
 	BOBBYR_FILTER_AMMO_SMG,
@@ -771,7 +771,7 @@ enum
 	BOBBYR_FILTER_AMMO_SHOTGUN,
 	// Used
 	BOBBYR_FILTER_USED_GUNS,
-	BOBBYR_FILTER_USED_AMMO,
+	//BOBBYR_FILTER_USED_AMMO,
 	BOBBYR_FILTER_USED_ARMOR,
 	BOBBYR_FILTER_USED_MISC,
 };
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index a62d576d..95fd40da 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -2809,23 +2809,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 3ed9d8eb..08edbc2d 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -2809,23 +2809,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index 396d2f75..13e5cff2 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -2798,23 +2798,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index ad5e2831..63be6d8e 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -2670,23 +2670,23 @@ STR16			BobbyRFilter[] =
 	L"Gewehr",
 	L"SS Gewehr",
 	L"Sturmgew.",
-	L"LMG",
+	L"MG",
 	L"Schrotfl.",
 
 	// Ammo
-	L"Schwere W.",
+	//L"Schwere W.",
 	L"Pistole",
 	L"M. Pistole",
 	L"SMG",
 	L"Gewehr",
 	L"SS Gewehr",
 	L"Sturmgew.",
-	L"LMG",
+	L"MG",
 	L"Schrotfl.",
 
 	// Used
 	L"Feuerwfn.",
-	L"Munition",
+	//L"Munition",
 	L"Rüstung",
 	L"Sonstiges",
 };
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index f0f0be79..6dad93de 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -2793,23 +2793,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index c9c037d9..d5733899 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -2791,23 +2791,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index a9f11796..d0f5390f 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -2800,23 +2800,23 @@ STR16			BobbyRFilter[] =
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Ammo
-	L"Heavy W.",
+	//L"Heavy W.",
 	L"Pistol",
 	L"M. Pistol",
 	L"SMG",
 	L"Rifle",
 	L"SN Rifle",
 	L"AS Rifle",
-	L"LMG",
+	L"MG",
 	L"Shotgun",
 
 	// Used
 	L"Guns",
-	L"Ammo",
+	//L"Ammo",
 	L"Armor",
 	L"Misc",
 };