Updated TaxController and changes in templates