Minor refactored invoice view