diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportCurrencyPage.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportCurrencyPage.java
index 7592a2f95..475f21387 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportCurrencyPage.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportCurrencyPage.java
@@ -28,7 +28,7 @@ public class SupportCurrencyPage extends SupportPage
 			int amount = CURRENCY_DEMONINATIONS[i];
 
 			addButton(slot,
-					new ShopItem(currency.getDisplayMaterial(), currency.getColor() + C.Bold + currency.getString(amount, false), new String[] {C.mBody + "Click to award", currency.getString(amount) }, 1, false, true),
+					new ShopItem(currency.getDisplayMaterial(), currency.getColor() + C.Bold + currency.getString(amount, false), new String[] {C.mBody + "Click to award " + currency.getString(amount) }, 1, false, true),
 					(p, c) -> getPlugin().getDonationManager().rewardCurrency(currency, _target, "Support - " + getPlayer().getName(), amount, true, (success) -> {
 						if (success)
 						{
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportHomePage.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportHomePage.java
index 76ed55c50..c21245812 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportHomePage.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportHomePage.java
@@ -6,11 +6,11 @@ import java.lang.reflect.InvocationTargetException;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
-import mineplex.core.Managers;
 import mineplex.core.account.CoreClient;
 import mineplex.core.common.util.C;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.staffServer.customerSupport.CustomerSupport;
+import mineplex.staffServer.ui.chest.SupportChestPage;
 
 public class SupportHomePage extends SupportPage
 {
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportChestPage.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportChestPage.java
similarity index 96%
rename from Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportChestPage.java
rename to Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportChestPage.java
index fd63ba314..36ab08e3d 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportChestPage.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportChestPage.java
@@ -1,17 +1,13 @@
-package mineplex.staffServer.ui;
+package mineplex.staffServer.ui.chest;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -22,6 +18,8 @@ import mineplex.core.common.util.C;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.core.treasure.types.TreasureType;
 import mineplex.staffServer.customerSupport.CustomerSupport;
+import mineplex.staffServer.ui.SupportPage;
+import mineplex.staffServer.ui.SupportShop;
 
 public class SupportChestPage extends SupportPage
 {
diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportGiveChestPage.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportGiveChestPage.java
similarity index 96%
rename from Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportGiveChestPage.java
rename to Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportGiveChestPage.java
index 2a48d1b88..8ab8263da 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportGiveChestPage.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportGiveChestPage.java
@@ -1,8 +1,7 @@
-package mineplex.staffServer.ui;
+package mineplex.staffServer.ui.chest;
 
 import java.util.Arrays;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
@@ -14,9 +13,10 @@ import mineplex.core.common.util.F;
 import mineplex.core.shop.item.SalesPackageBase;
 import mineplex.core.shop.item.ShopItem;
 import mineplex.core.treasure.ChestPackage;
-import mineplex.core.treasure.types.Treasure;
 import mineplex.core.treasure.types.TreasureType;
 import mineplex.staffServer.customerSupport.CustomerSupport;
+import mineplex.staffServer.ui.SupportPage;
+import mineplex.staffServer.ui.SupportShop;
 
 public class SupportGiveChestPage extends SupportPage
 {