Added better functionality to cart