Re-add viewers to InventoryMenu, fix a few bugs