Cart functionality immproved