Fix maths and price display

Minor changes to cart and order display.