Improvements to cart and admin screens