Inventory grid refactoring.