Added VAT fields, calculate tool