Improved Cart and Order pages