Initial reintegration of the new Invoice View