Replayed useful changes from last few InventoryModal commits after big merge.