Add item quantity and correct class names