invoice template changes, merged invoice view update