Added calculating total
Added total and vat calculations