diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
index 143794f24..a0ecf9001 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
@@ -53,37 +53,20 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
 //				" "
 //		}, 1, false));
 
-
-		addItem(4, new ShopItem(175, getDonationManager().Get(getPlayer().getName()).getCoins() + " Coins", new String[]
-				{
-						" ",
-						ChatColor.RESET + C.cYellow + "Purchase Coins",
-						ChatColor.RESET + "www.mineplex.com/shop",
-						" ",
-						ChatColor.RESET + C.cAqua + "Ultra Rank",
-						ChatColor.RESET + "Receives 7500 Coins per Month",
-						" ",
-						ChatColor.RESET + C.cPurple + "Hero Rank",
-						ChatColor.RESET + "Receives 15000 Coins per Month",
-						" ",
-						ChatColor.RESET + C.cGreen + "Legend Rank",
-						ChatColor.RESET + "Receives 30000 Coins per Month"
-				}, 1, false));
-
-		addButton(10, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this));
-		addButton(12, new ShopItem(Material.ARROW, "Arrow Trails", 1, false), new OpenArrowTrails(this));
-		addButton(14, new ShopItem(Material.GOLD_BOOTS, "Double Jump Effects", 1, false), new OpenDoubleJump(this));
-		addButton(16, new ShopItem(Material.SKULL_ITEM, "Death Animations", 1, false), new OpenDeathAnimations(this));
+		addButton(1, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this));
+		addButton(3, new ShopItem(Material.ARROW, "Arrow Trails", 1, false), new OpenArrowTrails(this));
+		addButton(5, new ShopItem(Material.GOLD_BOOTS, "Double Jump Effects", 1, false), new OpenDoubleJump(this));
+		addButton(7, new ShopItem(Material.SKULL_ITEM, "Death Animations", 1, false), new OpenDeathAnimations(this));
 		
-		addButton(28, new ShopItem(Material.MELON_BLOCK, "Gadgets", 1, false), new OpenGadgets(this));
-		addButton(30, new ShopItem(Material.LEATHER, "Morphs", 1, false), new OpenMorphs(this));
-		addButton(32, new ShopItem(Material.IRON_BARDING, "Mounts", 1, false), new OpenMounts(this));
-		addButton(34, new ShopItem(Material.BONE, "Pets", 1, false), new OpenPets(this));
+		addButton(19, new ShopItem(Material.MELON_BLOCK, "Gadgets", 1, false), new OpenGadgets(this));
+		addButton(21, new ShopItem(Material.LEATHER, "Morphs", 1, false), new OpenMorphs(this));
+		addButton(23, new ShopItem(Material.IRON_BARDING, "Mounts", 1, false), new OpenMounts(this));
+		addButton(25, new ShopItem(Material.BONE, "Pets", 1, false), new OpenPets(this));
 		
-		addButton(46, new ShopItem(Material.GOLD_HELMET, "Hats", 1, false), new OpenHats(this));
-		addButton(48, new ShopItem(Material.DIAMOND_CHESTPLATE, "Costumes", 1, false), new OpenCostumes(this));
-		addButton(50, new ShopItem(Material.GREEN_RECORD, "Music", 1, false), new OpenMusic(this));
-		addButton(52, new ShopItem(Material.NAME_TAG, "Taunts", 1, false), new IButton()
+		addButton(37, new ShopItem(Material.GOLD_HELMET, "Hats", 1, false), new OpenHats(this));
+		addButton(39, new ShopItem(Material.DIAMOND_CHESTPLATE, "Costumes", 1, false), new OpenCostumes(this));
+		addButton(42, new ShopItem(Material.GREEN_RECORD, "Music", 1, false), new OpenMusic(this));
+		addButton(44, new ShopItem(Material.NAME_TAG, "Taunts", 1, false), new IButton()
 		{
 			@Override
 			public void onClick(Player player, ClickType clickType)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
index 1c6de2bb4..4f1852000 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
@@ -30,8 +30,8 @@ import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.disguise.DisguiseManager;
 import mineplex.core.donation.DonationManager;
-import mineplex.core.gadget.event.GadgetActivateEvent;
 import mineplex.core.gadget.event.GadgetCollideEntityEvent;
+import mineplex.core.gadget.event.GadgetEnableEvent;
 import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCandyCane;
 import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFrostLord;
 import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailTitan;
@@ -578,7 +578,7 @@ public class GadgetManager extends MiniPlugin
 	}
 
 	@EventHandler
-	public void GadgetActivate(GadgetActivateEvent event)
+	public void GadgetActivate(GadgetEnableEvent event)
 	{
 		if (!_gadgetsEnabled)
 			event.setCancelled(true);
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index d9673ed0b..6eaf1149a 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -234,7 +234,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		_achievementManager.setGiveInterfaceItem(true);
 		_packetHandler = packetHandler;
 
-		new NotificationManager(getPlugin(), clientManager);
+		new NotificationManager(getPlugin(), clientManager, _preferences);
 		new BotSpamManager(plugin, clientManager, punish);
 
 		((CraftWorld)Bukkit.getWorlds().get(0)).getHandle().pvpMode = true;
@@ -933,7 +933,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		GetGadget().toggleGadgetEnabled();
 
 		for (Player player : UtilServer.getPlayers())
-			player.sendMessage(C.cWhite + C.Bold + "Gadgets/Mounts are now " + F.elem(_gadgetsEnabled ? C.cGreen + C.Bold + "Enabled" : C.cRed + C.Bold + "Disabled"));
+			player.sendMessage(C.cWhite + C.Bold + "Gadgets/Mounts are now " + F.elem(GetGadget().isGadgetEnabled() ? C.cGreen + C.Bold + "Enabled" : C.cRed + C.Bold + "Disabled"));
 	}
 
 	public void addGameMode(Player caller, Player target)
@@ -1007,7 +1007,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 	}
 
 	@EventHandler
-	public void disableMusicChristmas(GadgetActivateEvent event)
+	public void disableMusicChristmas(GadgetEnableEvent event)
 	{
 		if (event.getGadget() != null && event.getGadget().getGadgetType() == GadgetType.MusicDisc)
 		{