Change to a better way of showing items