diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
index a9030ffab..2f3dec95f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
@@ -70,7 +70,7 @@ public class PetTagPage extends ShopPageBase<CosmeticManager, CosmeticShop>
 			return;
 		}
 		
-		PetExtra tag = new PetExtra("Rename " + _pet.GetName() + " to " + _tagName, Material.NAME_TAG, 1000);
+		PetExtra tag = new PetExtra("Rename " + _pet.GetName() + " to " + _tagName, Material.NAME_TAG, 100);
 		
 		_pet.setDisplayName(C.cGreen + "Purchase " + _tagName);
 		
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
index 7a10a43ef..d16dd3f54 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
@@ -110,9 +110,12 @@ public class GadgetManager extends MiniPlugin
 		{
 			for (GadgetType gadgetType : _gadgets.keySet())
 			{
-				for (Gadget gadget : _gadgets.get(gadgetType))
+				if (gadgetType == GadgetType.Particle && _clientManager.Get(event.getPlayer()).GetRank().Has(Rank.ADMIN))
 				{
-					_donationManager.Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(gadget.GetName());
+					for (Gadget gadget : _gadgets.get(gadgetType))
+					{
+						_donationManager.Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(gadget.GetName());
+					}
 				}
 			}
 		}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java
index 416c54c1a..d8ee4751c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java
@@ -20,7 +20,7 @@ public class PetExtra extends SalesPackageBase
 		
 		_name = name;
 		_material = material;
-		CurrencyCostMap.put(CurrencyType.Gems, cost);
+		CurrencyCostMap.put(CurrencyType.Coins, cost);
 		
 		KnownPackage = false;
 		OneTimePurchaseOnly = false;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java
index 1616545a2..6f5b3e096 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetFactory.java
@@ -60,7 +60,7 @@ public class PetFactory
 
 	private void CreatePetExtras()
 	{
-		_petExtras.put(Material.SIGN, new PetExtra("Name Tag", Material.NAME_TAG, 1000));
+		_petExtras.put(Material.SIGN, new PetExtra("Name Tag", Material.NAME_TAG, 100));
 
 		List<PetExtraToken> petExtraTokens = new ArrayList<PetExtraToken>();
 		
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
index 7b3bc0faa..7e91cc67c 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
@@ -187,9 +187,10 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 
 	private void buildAvailableServerPage(List<ServerInfo> serverList, int slotsNeeded)
 	{
-		int serversToShow = 5;
+		int serversToShow = 7;
 		int greenCount = 0;
 		int yellowCount = 0;
+		int maxFull = 3;
 		int greenStartSlot = 18 + ((9 - serversToShow) / 2);
 		boolean showGreen = true;
 
@@ -199,6 +200,8 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 			showClock(portalTime);
 			showGreen = false;
 		}
+		
+		int fullCount = 0;
 
 		for (ServerInfo serverInfo : serverList)
 		{
@@ -208,11 +211,19 @@ public class ServerNpcPage extends ShopPageBase<ServerManager, ServerNpcShop> im
 			{
 				if (showGreen)
 				{
+					boolean full = serverInfo.MaxPlayers - serverInfo.CurrentPlayers <= 0;
+					
+					if (full && fullCount >= maxFull)
+						continue;
+						
 					ShopItem shopItem = buildShopItem(serverInfo, slotsNeeded);
 
 					greenCount++;
 
 					AddButton(slot, shopItem, new JoinServerButton(this, serverInfo));
+					
+					if (full)
+						fullCount++;
 				}
 			}
 			else if (isInProgress(serverInfo))