Moved discount below subtotal. #715