Inventory & exchange window improovements