Added client number and cleanup invoice template.