Inventory and Popup tweaks