More fixes to invoice view.