Allow the addition of the Firm email field from the Firm Company information to invoice template header.
Add Firm website field to Firm Company information and allow it to be added to invoice template header.
Also add a second street address field to company information for long addresses so they will display better on the invoice template header. e.g. allow a second field for the company's suite #.
Alternative would be to just put text boxes in the invoice template header and allow the user to type in any information they want.