Make Item less reliant on collection; fix columns