Updated and fixed the cart