theme cart improvements