Initial template and javascript reworking for new tax format.  Requires more testing.