Cart and visibility updates

More updates to the cart and more UI updates provided