Better invoice show, adding necessary fields