Further improvements to Item Display model