Shopping Cart and UI enhancements