[ItemWindow] Improving it.